diff options
| author | eroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-14 00:44:59 +0000 |
|---|---|---|
| committer | eroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-14 00:44:59 +0000 |
| commit | 1517425f81d0f49afcf4cc49f62ee2aa1995a4ca (patch) | |
| tree | 5e3b44c0eecc5e95322b65e93c3b6a33874dcec5 /chrome_frame/metrics_service.cc | |
| parent | 2687ad7d62c737430aa780f9db9a0a166931a735 (diff) | |
| download | chromium_src-1517425f81d0f49afcf4cc49f62ee2aa1995a4ca.zip chromium_src-1517425f81d0f49afcf4cc49f62ee2aa1995a4ca.tar.gz chromium_src-1517425f81d0f49afcf4cc49f62ee2aa1995a4ca.tar.bz2 | |
Add an option ProxyService::Create() to disable use of proxy auto-config.
BUG=40797
Review URL: http://codereview.chromium.org/3646004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62487 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/metrics_service.cc')
| -rw-r--r-- | chrome_frame/metrics_service.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome_frame/metrics_service.cc b/chrome_frame/metrics_service.cc index 9d135a7..20d55ce 100644 --- a/chrome_frame/metrics_service.cc +++ b/chrome_frame/metrics_service.cc @@ -131,7 +131,7 @@ extern base::LazyInstance<StatisticsRecorder> g_statistics_recorder_; // requests initiated by ChromeFrame. class ChromeFrameUploadRequestContext : public URLRequestContext { public: - ChromeFrameUploadRequestContext(MessageLoop* io_loop) + explicit ChromeFrameUploadRequestContext(MessageLoop* io_loop) : io_loop_(io_loop) { Initialize(); } @@ -157,8 +157,8 @@ class ChromeFrameUploadRequestContext : public URLRequestContext { const size_t kNetLogBound = 50u; net_log_.reset(new net::CapturingNetLog(kNetLogBound)); - proxy_service_ = net::ProxyService::Create(proxy_config_service, false, 0, - this, net_log_.get(), io_loop_); + proxy_service_ = net::ProxyService::CreateUsingSystemProxyResolver( + proxy_config_service, 0, net_log_.get()); DCHECK(proxy_service_); ssl_config_service_ = new net::SSLConfigServiceDefaults; @@ -200,7 +200,7 @@ class ChromeFrameUploadRequestContext : public URLRequestContext { // metrics HTTP upload requests initiated by ChromeFrame. class ChromeFrameUploadRequestContextGetter : public URLRequestContextGetter { public: - ChromeFrameUploadRequestContextGetter(MessageLoop* io_loop) + explicit ChromeFrameUploadRequestContextGetter(MessageLoop* io_loop) : io_loop_(io_loop) {} virtual URLRequestContext* GetURLRequestContext() { |