Move some proxy config code out of src/chrome

chrome/browser/chromeos/proxy_config_service_impl_unittest.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/chromeos/proxy_config_service_impl.h"
+#include "chromeos/network/proxy/proxy_config_service_impl.h"
 
 #include <stddef.h>
 
 #include <utility>
 #include <vector>
 
 #include "base/format_macros.h"
 #include "base/json/json_writer.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/strings/stringprintf.h"
-#include "chrome/browser/chromeos/net/proxy_config_handler.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chrome/browser/chromeos/settings/device_settings_service.h"
-#include "chrome/browser/chromeos/ui_proxy_config.h"
-#include "chrome/common/pref_names.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/shill_profile_client.h"
 #include "chromeos/dbus/shill_service_client.h"
 #include "chromeos/network/network_handler.h"
 #include "chromeos/network/network_profile_handler.h"
 #include "chromeos/network/network_state.h"
 #include "chromeos/network/network_state_handler.h"
 #include "chromeos/network/onc/onc_utils.h"
+#include "chromeos/network/proxy/proxy_config_handler.h"
+#include "chromeos/network/proxy/ui_proxy_config.h"
 #include "components/onc/onc_pref_names.h"
 #include "components/pref_registry/testing_pref_service_syncable.h"
 #include "components/prefs/testing_pref_service.h"
 #include "components/proxy_config/proxy_config_pref_names.h"
 #include "content/public/test/test_browser_thread.h"
 #include "net/proxy/proxy_config.h"
 #include "net/proxy/proxy_config_service_common_unittest.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
+// TODO(stevenjb): Refactor and move this to src/chromeos/network/proxy or
+// rename. This is really more of an integration test than a unit test at this
+// point and currently relies on some chrome specific components.
+
 using content::BrowserThread;
 
 namespace chromeos {
 
 namespace {
 
 struct Input {
   UIProxyConfig::Mode mode;
   std::string pac_url;
   std::string server;
@@ skipping 189 matching lines @@
     DBusThreadManager::Initialize();
     NetworkHandler::Initialize();
 
     PrefProxyConfigTrackerImpl::RegisterPrefs(pref_service_.registry());
     ::onc::RegisterPrefs(pref_service_.registry());
     PrefProxyConfigTrackerImpl::RegisterProfilePrefs(profile_prefs_.registry());
     ::onc::RegisterProfilePrefs(profile_prefs_.registry());
   }
 
   void SetUpProxyConfigService(PrefService* profile_prefs) {
-    config_service_impl_.reset(
-        new ProxyConfigServiceImpl(profile_prefs, &pref_service_));
+    config_service_impl_.reset(new ProxyConfigServiceImpl(
+        profile_prefs, &pref_service_,
+        BrowserThread::GetTaskRunnerForThread(BrowserThread::IO)));
     proxy_config_service_ =
         config_service_impl_->CreateTrackingProxyConfigService(
             std::unique_ptr<net::ProxyConfigService>());
 
     // CreateTrackingProxyConfigService triggers update of initial prefs proxy
     // config by tracker to chrome proxy config service, so flush all pending
     // tasks so that tests start fresh.
     base::RunLoop().RunUntilIdle();
   }
 
@@ skipping 260 matching lines @@
                                 network_configs.release());
 
   net::ProxyConfig actual_config;
   SyncGetLatestProxyConfig(&actual_config);
   net::ProxyConfig expected_config =
       net::ProxyConfig::CreateFromCustomPacURL(GURL("http://domain.com/x"));
   EXPECT_TRUE(expected_config.Equals(actual_config));
 }
 
 }  // namespace chromeos