diff options
| author | thomasvl@chromium.org <thomasvl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-14 14:56:27 +0000 |
|---|---|---|
| committer | thomasvl@chromium.org <thomasvl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-14 14:56:27 +0000 |
| commit | 88a2c4078d51ef9c5aec9270d8f72e517ad94e4e (patch) | |
| tree | a81dd5083fccc7f60028a25ecb554916ba26cf80 /chrome_frame | |
| parent | dd43578d4929c6502944871bc752905d5b61566f (diff) | |
| download | chromium_src-88a2c4078d51ef9c5aec9270d8f72e517ad94e4e.zip chromium_src-88a2c4078d51ef9c5aec9270d8f72e517ad94e4e.tar.gz chromium_src-88a2c4078d51ef9c5aec9270d8f72e517ad94e4e.tar.bz2 | |
Trying to green up the tree, lots of mac and win red around this cl.
Revert 59362 - net: Rename ProxyService::CreateNull to ProxyService::CreateDirect.
(Note: This was a TODO for eroman).
BUG=None
TEST=trybots
Review URL: http://codereview.chromium.org/3336021
TBR=tfarina@chromium.org
Review URL: http://codereview.chromium.org/3444001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59373 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
| -rw-r--r-- | chrome_frame/test/test_server_test.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome_frame/test/test_server_test.cc b/chrome_frame/test/test_server_test.cc index dbbbd20..84ca924 100644 --- a/chrome_frame/test/test_server_test.cc +++ b/chrome_frame/test/test_server_test.cc @@ -64,7 +64,7 @@ class URLRequestTestContext : public URLRequestContext { host_resolver_ = net::CreateSystemHostResolver(net::HostResolver::kDefaultParallelism, NULL); - proxy_service_ = net::ProxyService::CreateDirect(); + proxy_service_ = net::ProxyService::CreateNull(); ssl_config_service_ = new net::SSLConfigServiceDefaults; http_auth_handler_factory_ = net::HttpAuthHandlerFactory::CreateDefault(); http_transaction_factory_ = new net::HttpCache( |