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

Side by Side Diff: net/url_request/url_request_context_builder.cc

Issue 723343002: Update from https://crrev.com/304121 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 1 month 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 (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 "net/url_request/url_request_context_builder.h" 5 #include "net/url_request/url_request_context_builder.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 333 matching lines...) Expand 10 before | Expand all | Expand 10 after
344 network_session_params.testing_fixed_http_port = 344 network_session_params.testing_fixed_http_port =
345 http_network_session_params_.testing_fixed_http_port; 345 http_network_session_params_.testing_fixed_http_port;
346 network_session_params.testing_fixed_https_port = 346 network_session_params.testing_fixed_https_port =
347 http_network_session_params_.testing_fixed_https_port; 347 http_network_session_params_.testing_fixed_https_port;
348 network_session_params.use_alternate_protocols = 348 network_session_params.use_alternate_protocols =
349 http_network_session_params_.use_alternate_protocols; 349 http_network_session_params_.use_alternate_protocols;
350 network_session_params.trusted_spdy_proxy = 350 network_session_params.trusted_spdy_proxy =
351 http_network_session_params_.trusted_spdy_proxy; 351 http_network_session_params_.trusted_spdy_proxy;
352 network_session_params.next_protos = http_network_session_params_.next_protos; 352 network_session_params.next_protos = http_network_session_params_.next_protos;
353 network_session_params.enable_quic = http_network_session_params_.enable_quic; 353 network_session_params.enable_quic = http_network_session_params_.enable_quic;
354 network_session_params.quic_connection_options =
355 http_network_session_params_.quic_connection_options;
354 356
355 HttpTransactionFactory* http_transaction_factory = NULL; 357 HttpTransactionFactory* http_transaction_factory = NULL;
356 if (http_cache_enabled_) { 358 if (http_cache_enabled_) {
357 network_session_params.channel_id_service = 359 network_session_params.channel_id_service =
358 context->channel_id_service(); 360 context->channel_id_service();
359 HttpCache::BackendFactory* http_cache_backend = NULL; 361 HttpCache::BackendFactory* http_cache_backend = NULL;
360 if (http_cache_params_.type == HttpCacheParams::DISK) { 362 if (http_cache_params_.type == HttpCacheParams::DISK) {
361 http_cache_backend = new HttpCache::DefaultBackend( 363 http_cache_backend = new HttpCache::DefaultBackend(
362 DISK_CACHE, 364 DISK_CACHE,
363 net::CACHE_BACKEND_DEFAULT, 365 net::CACHE_BACKEND_DEFAULT,
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
401 #endif // !defined(DISABLE_FTP_SUPPORT) 403 #endif // !defined(DISABLE_FTP_SUPPORT)
402 404
403 storage->set_job_factory(job_factory); 405 storage->set_job_factory(job_factory);
404 406
405 // TODO(willchan): Support sdch. 407 // TODO(willchan): Support sdch.
406 408
407 return context; 409 return context;
408 } 410 }
409 411
410 } // namespace net 412 } // namespace net
OLDNEW
« no previous file with comments | « net/url_request/url_request_context_builder.h ('k') | net/url_request/url_request_file_job_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698