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

Side by Side Diff: chrome/browser/io_thread.cc

Issue 10905299: Fix bug in setting IOThread::Globals (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebaseline Created 8 years, 3 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/browser/io_thread.h" 5 #include "chrome/browser/io_thread.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/bind_helpers.h" 10 #include "base/bind_helpers.h"
(...skipping 489 matching lines...) Expand 10 before | Expand all | Expand 10 after
500 session_params.network_delegate = globals_->system_network_delegate.get(); 500 session_params.network_delegate = globals_->system_network_delegate.get();
501 // TODO(rtenneti): We should probably use HttpServerPropertiesManager for the 501 // TODO(rtenneti): We should probably use HttpServerPropertiesManager for the
502 // system URLRequestContext too. There's no reason this should be tied to a 502 // system URLRequestContext too. There's no reason this should be tied to a
503 // profile. 503 // profile.
504 session_params.net_log = net_log_; 504 session_params.net_log = net_log_;
505 session_params.host_mapping_rules = globals_->host_mapping_rules.get(); 505 session_params.host_mapping_rules = globals_->host_mapping_rules.get();
506 session_params.ignore_certificate_errors = 506 session_params.ignore_certificate_errors =
507 globals_->ignore_certificate_errors; 507 globals_->ignore_certificate_errors;
508 session_params.http_pipelining_enabled = globals_->http_pipelining_enabled; 508 session_params.http_pipelining_enabled = globals_->http_pipelining_enabled;
509 session_params.testing_fixed_http_port = globals_->testing_fixed_http_port; 509 session_params.testing_fixed_http_port = globals_->testing_fixed_http_port;
510 session_params.testing_fixed_https_port = globals_->http_pipelining_enabled; 510 session_params.testing_fixed_https_port = globals_->testing_fixed_https_port;
511 511
512 scoped_refptr<net::HttpNetworkSession> network_session( 512 scoped_refptr<net::HttpNetworkSession> network_session(
513 new net::HttpNetworkSession(session_params)); 513 new net::HttpNetworkSession(session_params));
514 globals_->proxy_script_fetcher_http_transaction_factory.reset( 514 globals_->proxy_script_fetcher_http_transaction_factory.reset(
515 new net::HttpNetworkLayer(network_session)); 515 new net::HttpNetworkLayer(network_session));
516 globals_->proxy_script_fetcher_ftp_transaction_factory.reset( 516 globals_->proxy_script_fetcher_ftp_transaction_factory.reset(
517 new net::FtpNetworkLayer(globals_->host_resolver.get())); 517 new net::FtpNetworkLayer(globals_->host_resolver.get()));
518 518
519 globals_->throttler_manager.reset(new net::URLRequestThrottlerManager()); 519 globals_->throttler_manager.reset(new net::URLRequestThrottlerManager());
520 globals_->throttler_manager->set_net_log(net_log_); 520 globals_->throttler_manager->set_net_log(net_log_);
(...skipping 174 matching lines...) Expand 10 before | Expand all | Expand 10 after
695 new net::HttpNetworkLayer( 695 new net::HttpNetworkLayer(
696 new net::HttpNetworkSession(system_params))); 696 new net::HttpNetworkSession(system_params)));
697 globals_->system_ftp_transaction_factory.reset( 697 globals_->system_ftp_transaction_factory.reset(
698 new net::FtpNetworkLayer(globals_->host_resolver.get())); 698 new net::FtpNetworkLayer(globals_->host_resolver.get()));
699 globals_->system_request_context.reset( 699 globals_->system_request_context.reset(
700 ConstructSystemRequestContext(globals_, net_log_)); 700 ConstructSystemRequestContext(globals_, net_log_));
701 701
702 sdch_manager_->set_sdch_fetcher( 702 sdch_manager_->set_sdch_fetcher(
703 new SdchDictionaryFetcher(system_url_request_context_getter_.get())); 703 new SdchDictionaryFetcher(system_url_request_context_getter_.get()));
704 } 704 }
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