QUIC - extend origin-to-force-quic-on command line option to accept list

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 <utility>
 #include <vector>
 
 #include "base/base64.h"
@@ skipping 1127 matching lines @@
   globals.quic_idle_connection_timeout_seconds.CopyToIfSet(
       &params->quic_idle_connection_timeout_seconds);
   globals.quic_disable_preconnect_if_0rtt.CopyToIfSet(
       &params->quic_disable_preconnect_if_0rtt);
   if (!globals.quic_host_whitelist.empty())
     params->quic_host_whitelist = globals.quic_host_whitelist;
   globals.quic_migrate_sessions_on_network_change.CopyToIfSet(
       &params->quic_migrate_sessions_on_network_change);
   globals.quic_migrate_sessions_early.CopyToIfSet(
       &params->quic_migrate_sessions_early);
-  globals.origin_to_force_quic_on.CopyToIfSet(
-      &params->origin_to_force_quic_on);
+  if (!globals.origins_to_force_quic_on.empty())
+    params->origins_to_force_quic_on = globals.origins_to_force_quic_on;
   params->enable_user_alternate_protocol_ports =
       globals.enable_user_alternate_protocol_ports;
   params->enable_token_binding = globals.enable_token_binding;
 }
 
 base::TimeTicks IOThread::creation_time() const {
   return creation_time_;
 }
 
 net::SSLConfigService* IOThread::GetSSLConfigService() {
@@ skipping 157 matching lines @@
   globals->quic_user_agent_id.set(quic_user_agent_id);
 
   net::QuicVersion version = GetQuicVersion(command_line, quic_trial_params);
   if (version != net::QUIC_VERSION_UNSUPPORTED) {
     net::QuicVersionVector supported_versions;
     supported_versions.push_back(version);
     globals->quic_supported_versions.set(supported_versions);
   }
 
   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);
+    std::string origins =
+        command_line.GetSwitchValueASCII(switches::kOriginToForceQuicOn);
+    for (const std::string& host_port : base::SplitString(
+             origins, ",", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL)) {
+      net::HostPortPair quic_origin = net::HostPortPair::FromString(host_port);
+      if (!quic_origin.IsEmpty())
+        globals->origins_to_force_quic_on.insert(quic_origin);
     }
   }
 }
 
 bool IOThread::ShouldDisableQuicWhenConnectionTimesOutWithOpenStreams(
     const VariationParameters& quic_trial_params) {
   return base::LowerCaseEqualsASCII(
     GetVariationParam(quic_trial_params,
       "disable_quic_on_timeout_with_open_streams"),
       "true");
@@ skipping 393 matching lines @@
       std::move(job_factory);
 
   context->set_job_factory(
       globals->proxy_script_fetcher_url_request_job_factory.get());
 
   // TODO(rtenneti): We should probably use HttpServerPropertiesManager for the
   // system URLRequestContext too. There's no reason this should be tied to a
   // profile.
   return context;
 }