summaryrefslogtreecommitdiffstats
path: root/chrome/test/plugin
diff options
context:
space:
mode:
authoreroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-14 00:44:59 +0000
committereroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-14 00:44:59 +0000
commit1517425f81d0f49afcf4cc49f62ee2aa1995a4ca (patch)
tree5e3b44c0eecc5e95322b65e93c3b6a33874dcec5 /chrome/test/plugin
parent2687ad7d62c737430aa780f9db9a0a166931a735 (diff)
downloadchromium_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/test/plugin')
-rw-r--r--chrome/test/plugin/plugin_test.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/chrome/test/plugin/plugin_test.cpp b/chrome/test/plugin/plugin_test.cpp
index 92c3832..0a9ca83 100644
--- a/chrome/test/plugin/plugin_test.cpp
+++ b/chrome/test/plugin/plugin_test.cpp
@@ -225,9 +225,8 @@ class PluginInstallerDownloadTest
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(),
- MessageLoop::current());
+ proxy_service_ = net::ProxyService::CreateUsingSystemProxyResolver(
+ proxy_config_service, 0, net_log_.get());
DCHECK(proxy_service_);
ssl_config_service_ = new net::SSLConfigServiceDefaults;