2 files changed, 8 insertions, 0 deletions
diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc
index 53d184f..65a555f 100644
--- a/chrome/browser/io_thread.cc
+++ b/chrome/browser/io_thread.cc
@@ -513,6 +513,11 @@ void IOThread::Init() {
     globals_->testing_fixed_https_port =
         GetSwitchValueAsInt(command_line, switches::kTestingFixedHttpsPort);
   }
+  if (command_line.HasSwitch(switches::kOriginPortToForceQuicOn)) {
+    globals_->origin_port_to_force_quic_on.set(
+        GetSwitchValueAsInt(command_line,
+                            switches::kOriginPortToForceQuicOn));
+  }
 
   InitializeNetworkOptions(command_line);
 
@@ -815,6 +820,8 @@ void IOThread::InitializeNetworkSessionParams(
       &params->enable_spdy_ping_based_connection_checking);
   globals_->spdy_default_protocol.CopyToIfSet(
       &params->spdy_default_protocol);
+  globals_->origin_port_to_force_quic_on.CopyToIfSet(
+      &params->origin_port_to_force_quic_on);
 }
 
 net::SSLConfigService* IOThread::GetSSLConfigService() {
diff --git a/chrome/browser/io_thread.h b/chrome/browser/io_thread.h
index fb7921a..0f1eab3 100644
--- a/chrome/browser/io_thread.h
+++ b/chrome/browser/io_thread.h
@@ -158,6 +158,7 @@ class IOThread : public content::BrowserThreadDelegate {
     Optional<bool> enable_spdy_compression;
     Optional<bool> enable_spdy_ping_based_connection_checking;
     Optional<net::NextProto> spdy_default_protocol;
+    Optional<uint16> origin_port_to_force_quic_on;
     // NetErrorTabHelper uses |dns_probe_service| to send DNS probes when a
     // main frame load fails with a DNS error in order to provide more useful
     // information to the renderer so it can show a more specific error page.