diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-15 18:31:03 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-15 18:31:03 +0000 |
| commit | 004ec925e3f71aeba2acd1461741ccddd92eeedc (patch) | |
| tree | e58efd0fc8f7b2baec92cde9d95fd8617d86d32d /chrome/browser/profiles/profile_impl_io_data.cc | |
| parent | 53f4636020e46d0ca54a60b1ecbbdcb677651c80 (diff) | |
| download | chromium_src-004ec925e3f71aeba2acd1461741ccddd92eeedc.zip chromium_src-004ec925e3f71aeba2acd1461741ccddd92eeedc.tar.gz chromium_src-004ec925e3f71aeba2acd1461741ccddd92eeedc.tar.bz2 | |
Revert 78228 - Extended: Add "system" URLRequestContext (not ready for use!)
This is an extension of http://codereview.chromium.org/6280018 that provides a proxy configuration which respects command line parameters and policies
BUG=67232,70732
TEST=Start chrome, observe two PROXY_CONFIG_CHANGED events in about:net-internals (if you are on a corporate network with PAC configurations), observe that everything behaves as usual. In particular the https://www.google.com/searchdomaincheck?format=domain&type=chrome request should not fail as it uses the new system URLRequestContext.
Review URL: http://codereview.chromium.org/6292017
TBR=battre@chromium.org
Review URL: http://codereview.chromium.org/6693023
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78240 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/profiles/profile_impl_io_data.cc')
| -rw-r--r-- | chrome/browser/profiles/profile_impl_io_data.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/chrome/browser/profiles/profile_impl_io_data.cc b/chrome/browser/profiles/profile_impl_io_data.cc index eaef474..faffcfb 100644 --- a/chrome/browser/profiles/profile_impl_io_data.cc +++ b/chrome/browser/profiles/profile_impl_io_data.cc @@ -12,7 +12,6 @@ #include "chrome/browser/net/chrome_dns_cert_provenance_checker_factory.h" #include "chrome/browser/net/chrome_net_log.h" #include "chrome/browser/net/chrome_network_delegate.h" -#include "chrome/browser/net/proxy_service_factory.h" #include "chrome/browser/net/sqlite_persistent_cookie_store.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_switches.h" @@ -174,7 +173,7 @@ void ProfileImplIOData::LazyInitializeInternal() const { media_request_context_->set_dns_cert_checker(dns_cert_checker_.get()); net::ProxyService* proxy_service = - ProxyServiceFactory::CreateProxyService( + CreateProxyService( io_thread->net_log(), io_thread_globals->proxy_script_fetcher_context.get(), lazy_params_->profile_params.proxy_config_service.release(), |