Switch from TestBrowserThread to TestBrowserThreadBundle in chrome.

chrome/browser/external_protocol/external_protocol_handler_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/external_protocol/external_protocol_handler.h"
 
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "chrome/browser/prefs/browser_prefs.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/prefs/testing_pref_service.h"
-#include "content/public/test/test_browser_thread.h"
+#include "content/public/test/test_browser_thread_bundle.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-using content::BrowserThread;
-
 class FakeExternalProtocolHandlerWorker
     : public shell_integration::DefaultProtocolClientWorker {
  public:
   FakeExternalProtocolHandlerWorker(
       const shell_integration::DefaultWebClientWorkerCallback& callback,
       const std::string& protocol,
       shell_integration::DefaultWebClientState os_state)
       : shell_integration::DefaultProtocolClientWorker(callback, protocol),
         os_state_(os_state) {}
 
@@ skipping 77 matching lines @@
   ExternalProtocolHandler::BlockState block_state_;
   shell_integration::DefaultWebClientState os_state_;
   bool has_launched_;
   bool has_prompted_;
   bool has_blocked_;
 };
 
 class ExternalProtocolHandlerTest : public testing::Test {
  protected:
   ExternalProtocolHandlerTest()
-      : ui_thread_(BrowserThread::UI, base::MessageLoop::current()),
-        file_thread_(BrowserThread::FILE) {}
+      : test_browser_thread_bundle_(
+            content::TestBrowserThreadBundle::REAL_FILE_THREAD) {}
 
   void SetUp() override {
-    file_thread_.Start();
     local_state_.reset(new TestingPrefServiceSimple);
     profile_.reset(new TestingProfile());
     chrome::RegisterLocalState(local_state_->registry());
     TestingBrowserProcess::GetGlobal()->SetLocalState(local_state_.get());
   }
 
   void TearDown() override {
     // Ensure that g_accept_requests gets set back to true after test execution.
     ExternalProtocolHandler::PermitLaunchUrl();
     TestingBrowserProcess::GetGlobal()->SetLocalState(nullptr);
@@ skipping 15 matching lines @@
     ExternalProtocolHandler::LaunchUrlWithDelegate(
         url, 0, 0, ui::PAGE_TRANSITION_LINK, true, &delegate_);
     if (block_state != ExternalProtocolHandler::BLOCK)
       base::RunLoop().Run();
 
     ASSERT_EQ(should_prompt, delegate_.has_prompted());
     ASSERT_EQ(should_launch, delegate_.has_launched());
     ASSERT_EQ(should_block, delegate_.has_blocked());
   }
 
-  base::MessageLoopForUI ui_message_loop_;
-  content::TestBrowserThread ui_thread_;
-  content::TestBrowserThread file_thread_;
+  content::TestBrowserThreadBundle test_browser_thread_bundle_;
 
   FakeExternalProtocolHandlerDelegate delegate_;
 
   std::unique_ptr<TestingPrefServiceSimple> local_state_;
   std::unique_ptr<TestingProfile> profile_;
 };
 
 TEST_F(ExternalProtocolHandlerTest, TestLaunchSchemeBlockedChromeDefault) {
   DoTest(ExternalProtocolHandler::BLOCK, shell_integration::IS_DEFAULT, false,
          false, true);
@@ skipping 95 matching lines @@
 TEST_F(ExternalProtocolHandlerTest, TestClearProfileState) {
   base::DictionaryValue prefs;
   prefs.SetBoolean("tel", true);
   profile_->GetPrefs()->Set(prefs::kExcludedSchemes, prefs);
   ASSERT_FALSE(
       profile_->GetPrefs()->GetDictionary(prefs::kExcludedSchemes)->empty());
   ExternalProtocolHandler::ClearData(profile_.get());
   ASSERT_TRUE(
       profile_->GetPrefs()->GetDictionary(prefs::kExcludedSchemes)->empty());
 }