Migrate ProxyConfigServiceImpl to NetworkStateHandler and NetworkProfileHandler.

chrome/browser/profiles/profile_manager_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 <string>
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/message_loop.h"
@@ skipping 21 matching lines @@
 #include "chrome/test/base/scoped_testing_local_state.h"
 #include "chrome/test/base/test_browser_window.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/test/test_browser_thread.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #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"
 #include "chrome/browser/chromeos/settings/device_settings_service.h"
 #include "chromeos/chromeos_switches.h"
 #endif
 
 using content::BrowserThread;
 
 namespace {
@@ skipping 40 matching lines @@
    public:
     MOCK_METHOD2(OnProfileCreated,
         void(Profile* profile, Profile::CreateStatus status));
   };
 
   ProfileManagerTest()
       : local_state_(TestingBrowserProcess::GetGlobal()),
         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() {
     // Create a new temporary directory, and store the path
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
     TestingBrowserProcess::GetGlobal()->SetProfileManager(
         new testing::ProfileManager(temp_dir_.path()));
 
 #if defined(OS_CHROMEOS)
   CommandLine* cl = CommandLine::ForCurrentProcess();
   cl->AppendSwitch(switches::kTestType);
 #endif
   }
 
   virtual void TearDown() {
     TestingBrowserProcess::GetGlobal()->SetProfileManager(NULL);
     message_loop_.RunUntilIdle();
   }
 
 #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
 
   // The path to temporary directory used to contain the test operations.
   base::ScopedTempDir temp_dir_;
   ScopedTestingLocalState local_state_;
   scoped_refptr<extensions::EventRouterForwarder>
       extension_event_router_forwarder_;
 
   MessageLoopForUI message_loop_;
   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_;
 #endif
 };
 
 TEST_F(ProfileManagerTest, GetProfile) {
   base::FilePath dest_path = temp_dir_.path();
   dest_path = dest_path.Append(FILE_PATH_LITERAL("New Profile"));
 
@@ skipping 454 matching lines @@
   browser2b.reset();
   last_opened_profiles = profile_manager->GetLastOpenedProfiles();
   ASSERT_EQ(1U, last_opened_profiles.size());
   EXPECT_EQ(profile1, last_opened_profiles[0]);
 
   browser1.reset();
   last_opened_profiles = profile_manager->GetLastOpenedProfiles();
   ASSERT_EQ(0U, last_opened_profiles.size());
 }
 #endif  // !defined(OS_ANDROID)