Switch from TestBrowserThread to TestBrowserThreadBundle in chrome.

chrome/browser/spellchecker/spellcheck_service_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/spellchecker/spellcheck_service.h"
 
 #include <ostream>
 
 #include "base/command_line.h"
 #include "base/macros.h"
-#include "base/message_loop/message_loop.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/supports_user_data.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "components/prefs/pref_registry_simple.h"
 #include "components/prefs/testing_pref_service.h"
 #include "components/spellcheck/browser/pref_names.h"
 #include "components/user_prefs/user_prefs.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"
 
 struct TestCase {
   TestCase(const std::string& accept_languages,
            const std::string& unsplit_spellcheck_dictionaries,
            const std::string& unsplit_expected_languages,
            const std::string& unsplit_expected_languages_used_for_spellcheck)
       : accept_languages(accept_languages),
         spellcheck_dictionaries(
             base::SplitString(unsplit_spellcheck_dictionaries,
@@ skipping 45 matching lines @@
       << "], expected=[";
   for (const auto& dictionary : test_case.expected_dictionaries) {
     out << dictionary << ",";
   }
   out << "]";
   return out;
 }
 
 class SpellcheckServiceUnitTest : public testing::TestWithParam<TestCase> {
  public:
-  SpellcheckServiceUnitTest()
-      : ui_thread_(content::BrowserThread::UI, &message_loop_) {
+  SpellcheckServiceUnitTest() {
     user_prefs::UserPrefs::Set(&context_, &prefs_);
   }
   ~SpellcheckServiceUnitTest() override {}
 
   void SetUp() override {
     prefs()->registry()->RegisterListPref(
         spellcheck::prefs::kSpellCheckDictionaries);
     prefs()->registry()->RegisterStringPref(prefs::kAcceptLanguages,
                                             std::string());
   }
 
   base::SupportsUserData* context() { return &context_; }
   TestingPrefServiceSimple* prefs() { return &prefs_; }
 
  private:
   struct : public base::SupportsUserData {
   } context_;
   TestingPrefServiceSimple prefs_;
-  base::MessageLoop message_loop_;
-  content::TestBrowserThread ui_thread_;
+  content::TestBrowserThreadBundle test_browser_thread_bundle_;
 
   DISALLOW_COPY_AND_ASSIGN(SpellcheckServiceUnitTest);
 };
 
 INSTANTIATE_TEST_CASE_P(
     TestCases,
     SpellcheckServiceUnitTest,
     testing::Values(
         TestCase("en,aa", "aa", "", ""),
         TestCase("en,en-JP,fr,aa", "fr", "fr", "fr"),
@@ skipping 12 matching lines @@
   base::ListValue spellcheck_dictionaries;
   spellcheck_dictionaries.AppendStrings(GetParam().spellcheck_dictionaries);
   prefs()->Set(spellcheck::prefs::kSpellCheckDictionaries,
                spellcheck_dictionaries);
 
   std::vector<SpellcheckService::Dictionary> dictionaries;
   SpellcheckService::GetDictionaries(context(), &dictionaries);
 
   EXPECT_EQ(GetParam().expected_dictionaries, dictionaries);
 }