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

Unified Diff: chrome/browser/io_thread.cc

Issue 2906463002: Make HttpNetworkSession::host_mapping_rules no longer a pointer. (Closed)
Patch Set: More upstream merge conflicts! Fun! Created 3 years, 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | google_apis/gcm/tools/mcs_probe.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/io_thread.cc
diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc
index 935ebc38f6145315bc250b6218e1d5633ef7f672..12463d42d27415cbd17305b7d799028c3699fe6b 100644
--- a/chrome/browser/io_thread.cc
+++ b/chrome/browser/io_thread.cc
@@ -649,15 +649,15 @@ void IOThread::Init() {
net::ProxyService::CreateDirectWithNetLog(net_log_);
globals_->dns_probe_service.reset(new chrome_browser_net::DnsProbeService());
globals_->host_mapping_rules.reset(new net::HostMappingRules());
- params_.host_mapping_rules = globals_->host_mapping_rules.get();
- globals_->http_user_agent_settings.reset(
- new net::StaticHttpUserAgentSettings(std::string(), GetUserAgent()));
if (command_line.HasSwitch(switches::kHostRules)) {
TRACE_EVENT_BEGIN0("startup", "IOThread::InitAsync:SetRulesFromString");
globals_->host_mapping_rules->SetRulesFromString(
command_line.GetSwitchValueASCII(switches::kHostRules));
TRACE_EVENT_END0("startup", "IOThread::InitAsync:SetRulesFromString");
}
+ params_.host_mapping_rules = *globals_->host_mapping_rules.get();
+ globals_->http_user_agent_settings.reset(
+ new net::StaticHttpUserAgentSettings(std::string(), GetUserAgent()));
globals_->enable_brotli =
base::FeatureList::IsEnabled(features::kBrotliEncoding);
params_.enable_token_binding =
« no previous file with comments | « no previous file | google_apis/gcm/tools/mcs_probe.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698