Change --origin-port-to-force-quic-on to --origin-to-force-quic-on.

chrome/browser/io_thread.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/io_thread.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 518 matching lines @@
     globals_->ignore_certificate_errors = true;
   if (command_line.HasSwitch(switches::kTestingFixedHttpPort)) {
     globals_->testing_fixed_http_port =
         GetSwitchValueAsInt(command_line, switches::kTestingFixedHttpPort);
   }
   if (command_line.HasSwitch(switches::kTestingFixedHttpsPort)) {
     globals_->testing_fixed_https_port =
         GetSwitchValueAsInt(command_line, switches::kTestingFixedHttpsPort);
   }
   globals_->enable_quic.set(ShouldEnableQuic(command_line));
-  if (command_line.HasSwitch(switches::kOriginPortToForceQuicOn)) {
-    globals_->origin_port_to_force_quic_on.set(
-        GetSwitchValueAsInt(command_line,
-                            switches::kOriginPortToForceQuicOn));
+  if (command_line.HasSwitch(switches::kOriginToForceQuicOn)) {
+    net::HostPortPair quic_origin =
+        net::HostPortPair::FromString(
+            command_line.GetSwitchValueASCII(switches::kOriginToForceQuicOn));
+    if (!quic_origin.IsEmpty()) {
+      globals_->origin_to_force_quic_on.set(quic_origin);
+    }
   }
   if (command_line.HasSwitch(
           switches::kEnableUserAlternateProtocolPorts)) {
     globals_->enable_user_alternate_protocol_ports = true;
   }
   InitializeNetworkOptions(command_line);
 
   net::HttpNetworkSession::Params session_params;
   InitializeNetworkSessionParams(&session_params);
   session_params.net_log = net_log_;
@@ skipping 308 matching lines @@
       &params->enable_spdy_ip_pooling);
   globals_->enable_spdy_credential_frames.CopyToIfSet(
       &params->enable_spdy_credential_frames);
   globals_->enable_spdy_compression.CopyToIfSet(
       &params->enable_spdy_compression);
   globals_->enable_spdy_ping_based_connection_checking.CopyToIfSet(
       &params->enable_spdy_ping_based_connection_checking);
   globals_->spdy_default_protocol.CopyToIfSet(
       &params->spdy_default_protocol);
   globals_->enable_quic.CopyToIfSet(&params->enable_quic);
-  globals_->origin_port_to_force_quic_on.CopyToIfSet(
-      &params->origin_port_to_force_quic_on);
+  globals_->origin_to_force_quic_on.CopyToIfSet(
+      &params->origin_to_force_quic_on);
   params->enable_user_alternate_protocol_ports =
       globals_->enable_user_alternate_protocol_ports;
 }
 
 net::SSLConfigService* IOThread::GetSSLConfigService() {
   return ssl_config_service_manager_->Get();
 }
 
 void IOThread::ChangedToOnTheRecordOnIOThread() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
@@ skipping 65 matching lines @@
       base::FieldTrialList::FindFullName(kQuicFieldTrialName);
 
   if (command_line.HasSwitch(switches::kDisableQuic))
     return false;
 
   if (command_line.HasSwitch(switches::kEnableQuic))
     return true;
 
   return quic_trial_group == kQuicFieldTrialEnabledGroupName;
 }