Migrate ProxyConfigServiceImpl to NetworkStateHandler and NetworkProfileHandler.

chrome/browser/profiles/profile_manager_unittest.cc

Index: chrome/browser/profiles/profile_manager_unittest.cc
diff --git a/chrome/browser/profiles/profile_manager_unittest.cc b/chrome/browser/profiles/profile_manager_unittest.cc
index 42c2ac2202f7bd067d1b548072189df6167568b0..8b13a096224988d3b5d892fa7f4c6f25dc24bbed 100644
--- a/chrome/browser/profiles/profile_manager_unittest.cc
+++ b/chrome/browser/profiles/profile_manager_unittest.cc
@@ -39,7 +39,6 @@
 #include "testing/gtest/include/gtest/gtest.h"
 
 #if defined(OS_CHROMEOS)
-#include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/login/mock_user_manager.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
@@ -100,10 +99,7 @@ class ProfileManagerTest : public testing::Test {
         extension_event_router_forwarder_(new extensions::EventRouterForwarder),
         ui_thread_(BrowserThread::UI, &message_loop_),
         db_thread_(BrowserThread::DB, &message_loop_),
-        file_thread_(BrowserThread::FILE, &message_loop_),
-        io_thread_(local_state_.Get(), g_browser_process->policy_service(),
-                   NULL, extension_event_router_forwarder_) {
-    TestingBrowserProcess::GetGlobal()->SetIOThread(&io_thread_);
+        file_thread_(BrowserThread::FILE, &message_loop_) {
   }
 
   virtual void SetUp() {
@@ -124,10 +120,6 @@ class ProfileManagerTest : public testing::Test {
   }
 
 #if defined(OS_CHROMEOS)
-  // Do not change order of stub_cros_enabler_, which needs to be constructed
-  // before io_thread_ which requires CrosLibrary to be initialized to construct
-  // its data member pref_proxy_config_tracker_ on ChromeOS.
-  chromeos::ScopedStubCrosEnabler stub_cros_enabler_;
   chromeos::ScopedTestDeviceSettingsService test_device_settings_service_;
   chromeos::ScopedTestCrosSettings test_cros_settings_;
 #endif
@@ -142,8 +134,6 @@ class ProfileManagerTest : public testing::Test {
   content::TestBrowserThread ui_thread_;
   content::TestBrowserThread db_thread_;
   content::TestBrowserThread file_thread_;
-  // IOThread is necessary for the creation of some services below.
-  IOThread io_thread_;

[rpetterson, 2013/05/28 17:08:38]

I assume you've tested that these test still pass? My recollection is that the
io_thread_ was necessary for some profile keyed services to work, but this may
no longer be the case with recent changes to the browser_context_keyed_service
framework.

 
 #if defined(OS_CHROMEOS)
   chromeos::ScopedTestUserManager test_user_manager_;