Switch from TestBrowserThread to TestBrowserThreadBundle in 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 "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/memory/ptr_util.h"
-#include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chrome/browser/chromeos/settings/device_settings_service.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/prefs/testing_pref_service.h"
 #include "components/proxy_config/proxy_config_pref_names.h"
 #include "components/sync_preferences/testing_pref_service_syncable.h"
 #include "content/public/test/test_browser_thread.h"
+#include "content/public/test/test_browser_thread_bundle.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;
@@ skipping 183 matching lines @@
     "        \"PAC\": \"http://domain.com/x\","
     "        \"Type\": \"PAC\" }"
     "    }";
 
 const char kUserProfilePath[] = "user_profile";
 
 }  // namespace
 
 class ProxyConfigServiceImplTest : public testing::Test {
  protected:
-  ProxyConfigServiceImplTest()
-      : ui_thread_(BrowserThread::UI, &loop_),
-        io_thread_(BrowserThread::IO, &loop_) {}
+  ProxyConfigServiceImplTest() = default;
 
   void SetUp() override {
     DBusThreadManager::Initialize();
     NetworkHandler::Initialize();
 
     PrefProxyConfigTrackerImpl::RegisterPrefs(pref_service_.registry());
     ::onc::RegisterPrefs(pref_service_.registry());
     PrefProxyConfigTrackerImpl::RegisterProfilePrefs(profile_prefs_.registry());
     ::onc::RegisterProfilePrefs(profile_prefs_.registry());
   }
@@ skipping 111 matching lines @@
     // Let message loop process all messages. This will run
     // ChromeProxyConfigService::UpdateProxyConfig, which is posted on IO from
     // PrefProxyConfigTrackerImpl::OnProxyConfigChanged.
     base::RunLoop().RunUntilIdle();
     net::ProxyConfigService::ConfigAvailability availability =
         proxy_config_service_->GetLatestProxyConfig(config);
 
     EXPECT_EQ(net::ProxyConfigService::CONFIG_VALID, availability);
   }
 
-  base::MessageLoop loop_;
+  content::TestBrowserThreadBundle test_browser_thread_bundle_;
   std::unique_ptr<net::ProxyConfigService> proxy_config_service_;
   std::unique_ptr<ProxyConfigServiceImpl> config_service_impl_;
   TestingPrefServiceSimple pref_service_;
   sync_preferences::TestingPrefServiceSyncable profile_prefs_;
 
  private:
   ScopedTestDeviceSettingsService test_device_settings_service_;
   ScopedTestCrosSettings test_cros_settings_;
-  content::TestBrowserThread ui_thread_;
-  content::TestBrowserThread io_thread_;
 };
 
 TEST_F(ProxyConfigServiceImplTest, NetworkProxy) {
   SetUpPrivateWiFi();
   // Create a ProxyConfigServiceImpl like for the system request context.
   SetUpProxyConfigService(nullptr /* no profile prefs */);
   for (size_t i = 0; i < arraysize(tests); ++i) {
     SCOPED_TRACE(base::StringPrintf("Test[%" PRIuS "] %s", i,
                                     tests[i].description.c_str()));
 
@@ skipping 134 matching lines @@
                                 std::move(network_configs));
 
   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