Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(267)

Side by Side Diff: webkit/tools/test_shell/test_shell_request_context.cc

Issue 7011044: Add a command line option to turn off retry attempts to resolve host (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « net/url_request/url_request_test_util.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "webkit/tools/test_shell/test_shell_request_context.h" 5 #include "webkit/tools/test_shell/test_shell_request_context.h"
6 6
7 #include "build/build_config.h" 7 #include "build/build_config.h"
8 8
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/file_path.h" 10 #include "base/file_path.h"
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 scoped_ptr<net::ProxyConfigService> proxy_config_service( 60 scoped_ptr<net::ProxyConfigService> proxy_config_service(
61 new net::ProxyConfigServiceFixed(net::ProxyConfig())); 61 new net::ProxyConfigServiceFixed(net::ProxyConfig()));
62 #else 62 #else
63 // Use the system proxy settings. 63 // Use the system proxy settings.
64 scoped_ptr<net::ProxyConfigService> proxy_config_service( 64 scoped_ptr<net::ProxyConfigService> proxy_config_service(
65 net::ProxyService::CreateSystemProxyConfigService( 65 net::ProxyService::CreateSystemProxyConfigService(
66 MessageLoop::current(), NULL)); 66 MessageLoop::current(), NULL));
67 #endif 67 #endif
68 storage_.set_host_resolver( 68 storage_.set_host_resolver(
69 net::CreateSystemHostResolver(net::HostResolver::kDefaultParallelism, 69 net::CreateSystemHostResolver(net::HostResolver::kDefaultParallelism,
70 net::HostResolver::kDefaultRetryAttempts,
70 NULL)); 71 NULL));
71 storage_.set_cert_verifier(new net::CertVerifier); 72 storage_.set_cert_verifier(new net::CertVerifier);
72 storage_.set_proxy_service(net::ProxyService::CreateUsingSystemProxyResolver( 73 storage_.set_proxy_service(net::ProxyService::CreateUsingSystemProxyResolver(
73 proxy_config_service.release(), 0, NULL)); 74 proxy_config_service.release(), 0, NULL));
74 storage_.set_ssl_config_service( 75 storage_.set_ssl_config_service(
75 new net::SSLConfigServiceDefaults); 76 new net::SSLConfigServiceDefaults);
76 77
77 storage_.set_http_auth_handler_factory( 78 storage_.set_http_auth_handler_factory(
78 net::HttpAuthHandlerFactory::CreateDefault(host_resolver())); 79 net::HttpAuthHandlerFactory::CreateDefault(host_resolver()));
79 80
(...skipping 17 matching lines...) Expand all
97 WebKit::webKitClient()->fileSystem())->file_system_context(); 98 WebKit::webKitClient()->fileSystem())->file_system_context();
98 } 99 }
99 100
100 TestShellRequestContext::~TestShellRequestContext() { 101 TestShellRequestContext::~TestShellRequestContext() {
101 } 102 }
102 103
103 const std::string& TestShellRequestContext::GetUserAgent( 104 const std::string& TestShellRequestContext::GetUserAgent(
104 const GURL& url) const { 105 const GURL& url) const {
105 return webkit_glue::GetUserAgent(url); 106 return webkit_glue::GetUserAgent(url);
106 } 107 }
OLDNEW
« no previous file with comments | « net/url_request/url_request_test_util.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698