Index: chrome/browser/io_thread.cc |
diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc |
index c0f4afe010a11249e1337e0541cd32a8abcf54de..b4bfcd69df864a3c7cc9429cea9a39095593440a 100644 |
--- a/chrome/browser/io_thread.cc |
+++ b/chrome/browser/io_thread.cc |
@@ -318,9 +318,8 @@ IOThread::IOThread( |
#if defined(ENABLE_EXTENSIONS) |
extension_event_router_forwarder_(extension_event_router_forwarder), |
#endif |
- globals_(nullptr), |
+ globals_(NULL), |
is_quic_allowed_by_policy_(true), |
- http_09_on_non_default_ports_enabled_(false), |
creation_time_(base::TimeTicks::Now()), |
weak_factory_(this) { |
scoped_refptr<base::SingleThreadTaskRunner> io_thread_proxy = |
@@ -395,13 +394,6 @@ IOThread::IOThread( |
if (value) |
value->GetAsBoolean(&is_quic_allowed_by_policy_); |
- value = policy_service |
- ->GetPolicies(policy::PolicyNamespace( |
- policy::POLICY_DOMAIN_CHROME, std::string())) |
- .GetValue(policy::key::kHttp09OnNonDefaultPortsEnabled); |
- if (value) |
- value->GetAsBoolean(&http_09_on_non_default_ports_enabled_); |
- |
// Some unit tests use IOThread but do not initialize MetricsService. In that |
// case it is fine not to have |metrics_data_use_forwarder_|. |
if (g_browser_process->metrics_service()) { |
@@ -615,8 +607,7 @@ void IOThread::Init() { |
net::CheckSupportAndMaybeEnableTCPFastOpen(always_enable_tfo_if_supported); |
ConfigureParamsFromFieldTrialsAndCommandLine( |
- command_line, is_quic_allowed_by_policy_, |
- http_09_on_non_default_ports_enabled_, ¶ms_); |
+ command_line, is_quic_allowed_by_policy_, ¶ms_); |
TRACE_EVENT_BEGIN0("startup", |
"IOThread::Init:ProxyScriptFetcherRequestContext"); |
@@ -895,7 +886,6 @@ net::URLRequestContext* IOThread::ConstructSystemRequestContext( |
void IOThread::ConfigureParamsFromFieldTrialsAndCommandLine( |
const base::CommandLine& command_line, |
bool is_quic_allowed_by_policy, |
- bool http_09_on_non_default_ports_enabled, |
net::HttpNetworkSession::Params* params) { |
std::string quic_user_agent_id = chrome::GetChannelString(); |
if (!quic_user_agent_id.empty()) |
@@ -992,9 +982,6 @@ void IOThread::ConfigureParamsFromFieldTrialsAndCommandLine( |
params->testing_fixed_https_port = |
GetSwitchValueAsInt(command_line, switches::kTestingFixedHttpsPort); |
} |
- |
- params->http_09_on_non_default_ports_enabled = |
- http_09_on_non_default_ports_enabled; |
} |
// static |