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

Side by Side Diff: chrome/service/net/service_url_request_context.cc

Issue 10854122: Fixed failing DCHECK on connector start. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 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 | « no previous file | 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) 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 "chrome/service/net/service_url_request_context.h" 5 #include "chrome/service/net/service_url_request_context.h"
6 6
7 #if defined(OS_POSIX) && !defined(OS_MACOSX) 7 #if defined(OS_POSIX) && !defined(OS_MACOSX)
8 #include <sys/utsname.h> 8 #include <sys/utsname.h>
9 #endif 9 #endif
10 10
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 NULL)); 115 NULL));
116 storage_.set_proxy_service(net::ProxyService::CreateUsingSystemProxyResolver( 116 storage_.set_proxy_service(net::ProxyService::CreateUsingSystemProxyResolver(
117 net_proxy_config_service, 0u, NULL)); 117 net_proxy_config_service, 0u, NULL));
118 storage_.set_cert_verifier(net::CertVerifier::CreateDefault()); 118 storage_.set_cert_verifier(net::CertVerifier::CreateDefault());
119 storage_.set_ftp_transaction_factory( 119 storage_.set_ftp_transaction_factory(
120 new net::FtpNetworkLayer(host_resolver())); 120 new net::FtpNetworkLayer(host_resolver()));
121 storage_.set_ssl_config_service(new net::SSLConfigServiceDefaults); 121 storage_.set_ssl_config_service(new net::SSLConfigServiceDefaults);
122 storage_.set_http_auth_handler_factory( 122 storage_.set_http_auth_handler_factory(
123 net::HttpAuthHandlerFactory::CreateDefault(host_resolver())); 123 net::HttpAuthHandlerFactory::CreateDefault(host_resolver()));
124 storage_.set_http_server_properties(new net::HttpServerPropertiesImpl); 124 storage_.set_http_server_properties(new net::HttpServerPropertiesImpl);
125 storage_.set_transport_security_state(new net::TransportSecurityState);
125 126
126 net::HttpNetworkSession::Params session_params; 127 net::HttpNetworkSession::Params session_params;
127 session_params.host_resolver = host_resolver(); 128 session_params.host_resolver = host_resolver();
128 session_params.cert_verifier = cert_verifier(); 129 session_params.cert_verifier = cert_verifier();
129 session_params.proxy_service = proxy_service(); 130 session_params.proxy_service = proxy_service();
130 session_params.ssl_config_service = ssl_config_service(); 131 session_params.ssl_config_service = ssl_config_service();
131 session_params.http_auth_handler_factory = http_auth_handler_factory(); 132 session_params.http_auth_handler_factory = http_auth_handler_factory();
132 session_params.http_server_properties = http_server_properties(); 133 session_params.http_server_properties = http_server_properties();
133 scoped_refptr<net::HttpNetworkSession> network_session( 134 scoped_refptr<net::HttpNetworkSession> network_session(
134 new net::HttpNetworkSession(session_params)); 135 new net::HttpNetworkSession(session_params));
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
176 proxy_config_service_.release())); 177 proxy_config_service_.release()));
177 return url_request_context_.get(); 178 return url_request_context_.get();
178 } 179 }
179 180
180 scoped_refptr<base::SingleThreadTaskRunner> 181 scoped_refptr<base::SingleThreadTaskRunner>
181 ServiceURLRequestContextGetter::GetNetworkTaskRunner() const { 182 ServiceURLRequestContextGetter::GetNetworkTaskRunner() const {
182 return network_task_runner_; 183 return network_task_runner_;
183 } 184 }
184 185
185 ServiceURLRequestContextGetter::~ServiceURLRequestContextGetter() {} 186 ServiceURLRequestContextGetter::~ServiceURLRequestContextGetter() {}
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698