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

Unified Diff: chrome/browser/io_thread.cc

Issue 2906463002: Make HttpNetworkSession::host_mapping_rules no longer a pointer. (Closed)
Patch Set: Oops 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') | net/base/host_mapping_rules.cc » ('J')
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 71e11962e31cbbe6c5a95404fdd6d3cb65d06d97..5ddeda3603871a211062362972619a4ffb450b0f 100644
--- a/chrome/browser/io_thread.cc
+++ b/chrome/browser/io_thread.cc
@@ -644,15 +644,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()));
Randy Smith (Not in Mondays) 2017/05/25 17:50:48 Why move this line? (I don't care, I'm just worri
mmenke 2017/05/25 18:07:10 Purely for code hygiene resions. It's weird to ha
Randy Smith (Not in Mondays) 2017/05/25 18:17:06 Understood; that's fine. (I understood moving th
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') | net/base/host_mapping_rules.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698