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

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

Issue 298063006: Make SdchManager per-profile. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Make access to sdch manager in tests go through an accessor." Created 6 years, 6 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 "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/base64.h" 9 #include "base/base64.h"
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 1029 matching lines...) Expand 10 before | Expand all | Expand 10 after
1040 system_params.net_log = net_log_; 1040 system_params.net_log = net_log_;
1041 system_params.proxy_service = globals_->system_proxy_service.get(); 1041 system_params.proxy_service = globals_->system_proxy_service.get();
1042 1042
1043 globals_->system_http_transaction_factory.reset( 1043 globals_->system_http_transaction_factory.reset(
1044 new net::HttpNetworkLayer( 1044 new net::HttpNetworkLayer(
1045 new net::HttpNetworkSession(system_params))); 1045 new net::HttpNetworkSession(system_params)));
1046 globals_->system_request_context.reset( 1046 globals_->system_request_context.reset(
1047 ConstructSystemRequestContext(globals_, net_log_)); 1047 ConstructSystemRequestContext(globals_, net_log_));
1048 1048
1049 sdch_manager_->set_sdch_fetcher( 1049 sdch_manager_->set_sdch_fetcher(
1050 new SdchDictionaryFetcher(system_url_request_context_getter_.get())); 1050 new SdchDictionaryFetcher(
1051 sdch_manager_, system_url_request_context_getter_.get()));
1051 } 1052 }
1052 1053
1053 void IOThread::UpdateDnsClientEnabled() { 1054 void IOThread::UpdateDnsClientEnabled() {
1054 globals()->host_resolver->SetDnsClientEnabled(*dns_client_enabled_); 1055 globals()->host_resolver->SetDnsClientEnabled(*dns_client_enabled_);
1055 } 1056 }
1056 1057
1057 void IOThread::ConfigureQuic(const CommandLine& command_line) { 1058 void IOThread::ConfigureQuic(const CommandLine& command_line) {
1058 // Always fetch the field trial group to ensure it is reported correctly. 1059 // Always fetch the field trial group to ensure it is reported correctly.
1059 // The command line flags will be associated with a group that is reported 1060 // The command line flags will be associated with a group that is reported
1060 // so long as trial is actually queried. 1061 // so long as trial is actually queried.
(...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after
1204 std::string version_flag = 1205 std::string version_flag =
1205 command_line.GetSwitchValueASCII(switches::kQuicVersion); 1206 command_line.GetSwitchValueASCII(switches::kQuicVersion);
1206 for (size_t i = 0; i < supported_versions.size(); ++i) { 1207 for (size_t i = 0; i < supported_versions.size(); ++i) {
1207 net::QuicVersion version = supported_versions[i]; 1208 net::QuicVersion version = supported_versions[i];
1208 if (net::QuicVersionToString(version) == version_flag) { 1209 if (net::QuicVersionToString(version) == version_flag) {
1209 return version; 1210 return version;
1210 } 1211 }
1211 } 1212 }
1212 return net::QUIC_VERSION_UNSUPPORTED; 1213 return net::QUIC_VERSION_UNSUPPORTED;
1213 } 1214 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698