Switch from TestBrowserThread to TestBrowserThreadBundle in chrome.

chrome/browser/extensions/extension_web_ui_unittest.cc

 // Copyright 2014 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/extensions/extension_web_ui.h"
 
 #include "base/command_line.h"
 #include "base/memory/ptr_util.h"
-#include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "build/build_config.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_web_ui_override_registrar.h"
 #include "chrome/browser/extensions/test_extension_system.h"
 #include "chrome/test/base/testing_profile.h"
-#include "content/public/test/test_browser_thread.h"
+#include "content/public/test/test_browser_thread_bundle.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_builder.h"
 #include "extensions/common/manifest_constants.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/login/users/scoped_test_user_manager.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chrome/browser/chromeos/settings/device_settings_service.h"
 #endif
 
 namespace extensions {
 
 namespace {
 
 std::unique_ptr<KeyedService> BuildOverrideRegistrar(
     content::BrowserContext* context) {
   return base::MakeUnique<ExtensionWebUIOverrideRegistrar>(context);
 }
 
 }  // namespace
 
 class ExtensionWebUITest : public testing::Test {
  public:
-  ExtensionWebUITest()
-      : ui_thread_(content::BrowserThread::UI, &message_loop_) {}
+  ExtensionWebUITest() = default;
 
  protected:
   void SetUp() override {
     profile_.reset(new TestingProfile());
     TestExtensionSystem* system =
         static_cast<TestExtensionSystem*>(ExtensionSystem::Get(profile_.get()));
     extension_service_ = system->CreateExtensionService(
         base::CommandLine::ForCurrentProcess(), base::FilePath(), false);
     ExtensionWebUIOverrideRegistrar::GetFactoryInstance()->SetTestingFactory(
         profile_.get(), &BuildOverrideRegistrar);
     ExtensionWebUIOverrideRegistrar::GetFactoryInstance()->Get(profile_.get());
   }
 
   void TearDown() override {
     profile_.reset();
     base::RunLoop().RunUntilIdle();
   }
 
   std::unique_ptr<TestingProfile> profile_;
   ExtensionService* extension_service_;
-  base::MessageLoop message_loop_;
-  content::TestBrowserThread ui_thread_;
+  content::TestBrowserThreadBundle test_browser_thread_bundle_;
 
 #if defined OS_CHROMEOS
   chromeos::ScopedTestDeviceSettingsService test_device_settings_service_;
   chromeos::ScopedTestCrosSettings test_cros_settings_;
   chromeos::ScopedTestUserManager test_user_manager_;
 #endif
 };
 
 // Test that component extension url overrides have lower priority than
 // non-component extension url overrides.
@@ skipping 79 matching lines @@
   changed_url = kBookmarksUrl;
   EXPECT_TRUE(
       ExtensionWebUI::HandleChromeURLOverride(&changed_url, profile_.get()));
   EXPECT_EQ(kExpectedUnpackedOverrideUrl, changed_url);
   EXPECT_TRUE(ExtensionWebUI::HandleChromeURLOverrideReverse(&changed_url,
                                                              profile_.get()));
   EXPECT_EQ(kBookmarksUrl, changed_url);
 }
 
 }  // namespace extensions