Move ProxyServiceFactory to components/proxy_service/ios.

ios/chrome/browser/ios_chrome_io_thread.mm

 // Copyright 2015 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/chrome/browser/ios_chrome_io_thread.h"
 
 #include <stddef.h>
 
 #include <utility>
 #include <vector>
@@ skipping 12 matching lines @@
 #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/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/chrome/browser/chrome_switches.h"
 #include "ios/chrome/browser/net/cookie_util.h"
 #include "ios/chrome/browser/net/ios_chrome_network_delegate.h"
-#include "ios/chrome/browser/net/proxy_service_factory.h"
 #include "ios/chrome/common/channel_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"
 #include "net/cert/ct_known_logs.h"
 #include "net/cert/ct_log_verifier.h"
 #include "net/cert/ct_policy_enforcer.h"
 #include "net/cert/ct_verifier.h"
@@ skipping 220 matching lines @@
 
 // |local_state| is passed in explicitly in order to (1) reduce implicit
 // dependencies and (2) make IOSChromeIOThread more flexible for testing.
 IOSChromeIOThread::IOSChromeIOThread(PrefService* local_state,
                                      net_log::ChromeNetLog* net_log)
     : net_log_(net_log),
       globals_(nullptr),
       creation_time_(base::TimeTicks::Now()),
       weak_factory_(this) {
   pref_proxy_config_tracker_ =
-      ios::ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState(
+      ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState(
           local_state);
   IOSChromeNetworkDelegate::InitializePrefsOnUIThread(nullptr, local_state);
   ssl_config_service_manager_.reset(
       ssl_config::SSLConfigServiceManager::CreateDefaultManager(
           local_state,
           web::WebThread::GetTaskRunnerForThread(web::WebThread::IO)));
 
   web::WebThread::SetDelegate(web::WebThread::IO, this);
 }
 
@@ skipping 200 matching lines @@
   // in about:net-internals.
   ClearHostCache();
 }
 
 void IOSChromeIOThread::InitSystemRequestContext() {
   if (system_url_request_context_getter_.get())
     return;
   // If we're in unit_tests, IOSChromeIOThread may not be run.
   if (!web::WebThread::IsMessageLoopValid(web::WebThread::IO))
     return;
-  system_proxy_config_service_ =
-      ios::ProxyServiceFactory::CreateProxyConfigService(
-          pref_proxy_config_tracker_.get());
+  system_proxy_config_service_ = ProxyServiceFactory::CreateProxyConfigService(
+      pref_proxy_config_tracker_.get());
 
   system_url_request_context_getter_ = new SystemURLRequestContextGetter(this);
   // Safe to post an unretained this pointer, since IOSChromeIOThread is
   // guaranteed to outlive the IO WebThread.
   web::WebThread::PostTask(
       web::WebThread::IO, FROM_HERE,
       base::Bind(&IOSChromeIOThread::InitSystemRequestContextOnIOThread,
                  base::Unretained(this)));
 }
 
 void IOSChromeIOThread::InitSystemRequestContextOnIOThread() {
   DCHECK_CURRENTLY_ON(web::WebThread::IO);
   DCHECK(!globals_->system_proxy_service.get());
   DCHECK(system_proxy_config_service_.get());
 
-  globals_->system_proxy_service = ios::ProxyServiceFactory::CreateProxyService(
+  globals_->system_proxy_service = ProxyServiceFactory::CreateProxyService(
       net_log_, nullptr, globals_->system_network_delegate.get(),
       std::move(system_proxy_config_service_), true /* quick_check_enabled */);
 
   globals_->system_request_context.reset(
       ConstructSystemRequestContext(globals_, params_, net_log_));
 }
 
 net::URLRequestContext* IOSChromeIOThread::ConstructSystemRequestContext(
     IOSChromeIOThread::Globals* globals,
     const net::HttpNetworkSession::Params& params,
@@ skipping 38 matching lines @@
 
   globals->system_http_network_session.reset(
       new net::HttpNetworkSession(system_params));
   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;
 }