angler-fishThe Vulnerability History Project

Reland r74842

      Merged correctly this time.

BUG=none
TEST=none

Review URL: http://codereview.chromium.org/6523067

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75165 0039d316-1c4b-4281-b951-d872f2087c98
by Guy the Water Buffalo 2011-02-16 19:45:41 UTC
commit f6c21cb31f1b7bd4e8873a55e9954eece1fddda5
Chromium VCC CVE-2011-3083
chrome/browser/io_thread.cc
-1
chrome/browser/net/chrome_url_request_context.cc
+556 -61
chrome/browser/net/chrome_url_request_context.h
+103 -14
chrome/browser/net/connection_tester.cc
+23 -27
chrome/browser/policy/device_management_service.cc
+11 -10
chrome/browser/profiles/off_the_record_profile_io_data.cc
-188
chrome/browser/profiles/off_the_record_profile_io_data.h
-110
chrome/browser/profiles/profile.cc
+29 -23
chrome/browser/profiles/profile_impl.cc
+22 -27
chrome/browser/profiles/profile_impl.h
+3 -3
chrome/browser/profiles/profile_impl_io_data.cc
-282
chrome/browser/profiles/profile_impl_io_data.h
-114
chrome/browser/profiles/profile_io_data.cc
+132 -273
chrome/browser/profiles/profile_io_data.h
+88 -119
chrome/browser/renderer_host/resource_dispatcher_host.cc
-1
chrome/browser/sync/glue/http_bridge.cc
+10 -10
chrome/chrome_browser.gypi
-4
chrome/service/net/service_url_request_context.cc
+26 -28
chrome/service/net/service_url_request_context.h
+4
chrome/test/testing_profile.cc
+1 -1
chrome_frame/metrics_service.cc
+21 -21
net/base/cookie_policy.h
+3 -2
net/proxy/proxy_script_fetcher_impl_unittest.cc
+14 -14
net/spdy/spdy_test_util.cc
+18 -18
net/url_request/url_request_context.cc
+4 -6
net/url_request/url_request_context.h
+23 -40
net/url_request/url_request_test_util.cc
+28 -28
net/url_request/url_request_test_util.h
+4
net/url_request/view_cache_helper_unittest.cc
+1 -1
net/websockets/websocket_job_unittest.cc
+2 -2
webkit/tools/test_shell/test_shell_request_context.cc
+23 -23
expand_less