Move some of IOThread's command line logic to network_session_configurator.

ios/components/io_thread/ios_io_thread.mm

 // Copyright 2017 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 "ios/components/io_thread/ios_io_thread.h"
 
 #include <stddef.h>
 
 #include <utility>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
+#include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/debug/leak_tracker.h"
 #include "base/environment.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/metrics/field_trial.h"
 #include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "base/threading/thread.h"
 #include "base/time/time.h"
 #include "base/trace_event/trace_event.h"
 #include "components/net_log/chrome_net_log.h"
-#include "components/network_session_configurator/network_session_configurator.h"
+#include "components/network_session_configurator/browser/network_session_configurator.h"
 #include "components/prefs/pref_service.h"
 #include "components/proxy_config/ios/proxy_service_factory.h"
 #include "components/proxy_config/pref_proxy_config_tracker.h"
 #include "components/variations/variations_associated_data.h"
 #include "components/version_info/version_info.h"
 #include "ios/web/public/user_agent.h"
 #include "ios/web/public/web_client.h"
 #include "ios/web/public/web_thread.h"
 #include "net/base/sdch_manager.h"
 #include "net/cert/cert_verifier.h"
@@ skipping 299 matching lines @@
   params_.enable_user_alternate_protocol_ports = false;
 
   std::string quic_user_agent_id = GetChannelString();
   if (!quic_user_agent_id.empty())
     quic_user_agent_id.push_back(' ');
   quic_user_agent_id.append(
       version_info::GetProductNameAndVersionForUserAgent());
   quic_user_agent_id.push_back(' ');
   quic_user_agent_id.append(web::BuildOSCpuInfo());
 
-  network_session_configurator::ParseFieldTrials(
-      /*is_quic_force_disabled=*/false,
-      /*is_quic_force_enabled=*/false, quic_user_agent_id, &params_);
+  // Set up field trials, ignoring debug command line options.
+  network_session_configurator::ParseCommandLineAndFieldTrials(
+      base::CommandLine(base::CommandLine::NO_PROGRAM),
+      /*is_quic_force_disabled=*/false, quic_user_agent_id, &params_);
 
   // InitSystemRequestContext turns right around and posts a task back
   // to the IO thread, so we can't let it run until we know the IO
   // thread has started.
   //
   // Note that since we are at WebThread::Init time, the UI thread
   // is blocked waiting for the thread to start.  Therefore, posting
   // this task to the main thread's message loop here is guaranteed to
   // get it onto the message loop while the IOSIOThread object still
   // exists.  However, the message might not be processed on the UI
@@ skipping 139 matching lines @@
       new net::HttpNetworkSession(params, system_context));
   globals->system_http_transaction_factory.reset(
       new net::HttpNetworkLayer(globals->system_http_network_session.get()));
   context->set_http_transaction_factory(
       globals->system_http_transaction_factory.get());
 
   return context;
 }
 
 }  // namespace io_thread