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

Side by Side Diff: chromecast/browser/url_request_context_factory.cc

Issue 1268313004: s/use_alternate_protocols/use_alternative_services/g (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Re: #15. Created 5 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "chromecast/browser/url_request_context_factory.h" 5 #include "chromecast/browser/url_request_context_factory.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/files/file_path.h" 8 #include "base/files/file_path.h"
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "base/threading/worker_pool.h" 10 #include "base/threading/worker_pool.h"
(...skipping 280 matching lines...) Expand 10 before | Expand all | Expand 10 after
291 params->ssl_config_service = ssl_config_service_.get(); 291 params->ssl_config_service = ssl_config_service_.get();
292 params->transport_security_state = transport_security_state_.get(); 292 params->transport_security_state = transport_security_state_.get();
293 params->http_auth_handler_factory = http_auth_handler_factory_.get(); 293 params->http_auth_handler_factory = http_auth_handler_factory_.get();
294 params->http_server_properties = http_server_properties_->GetWeakPtr(); 294 params->http_server_properties = http_server_properties_->GetWeakPtr();
295 params->ignore_certificate_errors = ignore_certificate_errors; 295 params->ignore_certificate_errors = ignore_certificate_errors;
296 params->proxy_service = proxy_service_.get(); 296 params->proxy_service = proxy_service_.get();
297 297
298 // TODO(lcwu): http://crbug.com/329681. Remove this once spdy is enabled 298 // TODO(lcwu): http://crbug.com/329681. Remove this once spdy is enabled
299 // by default at the content level. 299 // by default at the content level.
300 params->next_protos = net::NextProtosSpdy31(); 300 params->next_protos = net::NextProtosSpdy31();
301 params->use_alternate_protocols = true; 301 params->use_alternative_services = true;
302 } 302 }
303 303
304 net::URLRequestContext* URLRequestContextFactory::CreateSystemRequestContext() { 304 net::URLRequestContext* URLRequestContextFactory::CreateSystemRequestContext() {
305 DCHECK_CURRENTLY_ON(content::BrowserThread::IO); 305 DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
306 InitializeSystemContextDependencies(); 306 InitializeSystemContextDependencies();
307 net::HttpNetworkSession::Params system_params; 307 net::HttpNetworkSession::Params system_params;
308 PopulateNetworkSessionParams(false, &system_params); 308 PopulateNetworkSessionParams(false, &system_params);
309 system_transaction_factory_.reset(new net::HttpNetworkLayer( 309 system_transaction_factory_.reset(new net::HttpNetworkLayer(
310 new net::HttpNetworkSession(system_params))); 310 new net::HttpNetworkSession(system_params)));
311 system_job_factory_.reset(new net::URLRequestJobFactoryImpl()); 311 system_job_factory_.reset(new net::URLRequestJobFactoryImpl());
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
409 409
410 void URLRequestContextFactory::InitializeNetworkDelegates() { 410 void URLRequestContextFactory::InitializeNetworkDelegates() {
411 app_network_delegate_->Initialize(false); 411 app_network_delegate_->Initialize(false);
412 LOG(INFO) << "Initialized app network delegate."; 412 LOG(INFO) << "Initialized app network delegate.";
413 system_network_delegate_->Initialize(false); 413 system_network_delegate_->Initialize(false);
414 LOG(INFO) << "Initialized system network delegate."; 414 LOG(INFO) << "Initialized system network delegate.";
415 } 415 }
416 416
417 } // namespace shell 417 } // namespace shell
418 } // namespace chromecast 418 } // namespace chromecast
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698