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

Side by Side Diff: remoting/host/url_request_context.cc

Issue 10831277: [net] Change factory methods for HostResolver and HostCache to return a scoped_ptr (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sync Created 8 years, 2 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "remoting/host/url_request_context.h" 5 #include "remoting/host/url_request_context.h"
6 6
7 #include "base/message_loop_proxy.h" 7 #include "base/message_loop_proxy.h"
8 #include "net/base/cert_verifier.h" 8 #include "net/base/cert_verifier.h"
9 #include "net/base/host_resolver.h" 9 #include "net/base/host_resolver.h"
10 #include "net/base/ssl_config_service_defaults.h" 10 #include "net/base/ssl_config_service_defaults.h"
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 77
78 } // namespace 78 } // namespace
79 79
80 // TODO(willchan): This is largely copied from service_url_request_context.cc, 80 // TODO(willchan): This is largely copied from service_url_request_context.cc,
81 // which is in turn copied from some test code. Move it somewhere reusable. 81 // which is in turn copied from some test code. Move it somewhere reusable.
82 URLRequestContext::URLRequestContext( 82 URLRequestContext::URLRequestContext(
83 scoped_ptr<net::ProxyConfigService> proxy_config_service) 83 scoped_ptr<net::ProxyConfigService> proxy_config_service)
84 : ALLOW_THIS_IN_INITIALIZER_LIST(storage_(this)) { 84 : ALLOW_THIS_IN_INITIALIZER_LIST(storage_(this)) {
85 scoped_ptr<VlogNetLog> net_log(new VlogNetLog()); 85 scoped_ptr<VlogNetLog> net_log(new VlogNetLog());
86 storage_.set_host_resolver( 86 storage_.set_host_resolver(
87 net::CreateSystemHostResolver(net::HostResolver::kDefaultParallelism, 87 net::HostResolver::CreateDefaultResolver(net_log.get()));
88 net::HostResolver::kDefaultRetryAttempts,
89 net_log.get()));
90 storage_.set_proxy_service(net::ProxyService::CreateUsingSystemProxyResolver( 88 storage_.set_proxy_service(net::ProxyService::CreateUsingSystemProxyResolver(
91 proxy_config_service.release(), 0u, net_log.get())); 89 proxy_config_service.release(), 0u, net_log.get()));
92 storage_.set_cert_verifier(net::CertVerifier::CreateDefault()); 90 storage_.set_cert_verifier(net::CertVerifier::CreateDefault());
93 storage_.set_ssl_config_service(new net::SSLConfigServiceDefaults); 91 storage_.set_ssl_config_service(new net::SSLConfigServiceDefaults);
94 storage_.set_http_auth_handler_factory( 92 storage_.set_http_auth_handler_factory(
95 net::HttpAuthHandlerFactory::CreateDefault(host_resolver())); 93 net::HttpAuthHandlerFactory::CreateDefault(host_resolver()));
96 storage_.set_http_server_properties(new net::HttpServerPropertiesImpl); 94 storage_.set_http_server_properties(new net::HttpServerPropertiesImpl);
97 storage_.set_transport_security_state(new net::TransportSecurityState); 95 storage_.set_transport_security_state(new net::TransportSecurityState);
98 96
99 net::HttpNetworkSession::Params session_params; 97 net::HttpNetworkSession::Params session_params;
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 131
134 scoped_refptr<base::SingleThreadTaskRunner> 132 scoped_refptr<base::SingleThreadTaskRunner>
135 URLRequestContextGetter::GetNetworkTaskRunner() const { 133 URLRequestContextGetter::GetNetworkTaskRunner() const {
136 return network_task_runner_; 134 return network_task_runner_;
137 } 135 }
138 136
139 URLRequestContextGetter::~URLRequestContextGetter() { 137 URLRequestContextGetter::~URLRequestContextGetter() {
140 } 138 }
141 139
142 } // namespace remoting 140 } // namespace remoting
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698