Switch from TestBrowserThread to TestBrowserThreadBundle in chrome.

chrome/browser/history/android/android_history_provider_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/history/android/android_history_provider_service.h"
 
 #include <stdint.h>
 
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/task/cancelable_task_tracker.h"
 #include "base/time/time.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_profile.h"
 #include "chrome/test/base/testing_profile_manager.h"
 #include "components/bookmarks/test/bookmark_test_helpers.h"
 #include "components/history/core/browser/android/android_history_types.h"
 #include "content/public/browser/browser_thread.h"
-#include "content/public/test/test_browser_thread.h"
+#include "content/public/test/test_browser_thread_bundle.h"
 #include "sql/statement.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
 using base::Bind;
 using base::Time;
-using content::BrowserThread;
 using history::AndroidStatement;
 using history::HistoryAndBookmarkRow;
 using history::SearchRow;
 
 // The test cases in this file don't intent to test the detail features of
 // Android content provider which have been covered by
 // android_provider_backend_unittest.cc, instead, they verify the code path to
 // AndroidProviderBackend working fine.
 
 class AndroidHistoryProviderServiceTest : public testing::Test {
  public:
   AndroidHistoryProviderServiceTest()
-      : profile_manager_(
-          TestingBrowserProcess::GetGlobal()),
-        ui_thread_(BrowserThread::UI, &message_loop_),
-        file_thread_(BrowserThread::FILE, &message_loop_) {
-  }
+      : profile_manager_(TestingBrowserProcess::GetGlobal()) {}
   ~AndroidHistoryProviderServiceTest() override {}
 
  protected:
   void SetUp() override {
     // Setup the testing profile, so the bookmark_model_sql_handler could
     // get the bookmark model from it.
     ASSERT_TRUE(profile_manager_.SetUp());
     // It seems that the name has to be chrome::kInitialProfile, so it
     // could be found by ProfileManager::GetLastUsedProfile().
     testing_profile_ = profile_manager_.CreateTestingProfile(
         chrome::kInitialProfile);
 
     testing_profile_->CreateBookmarkModel(true);
     bookmarks::test::WaitForBookmarkModelToLoad(
         BookmarkModelFactory::GetForBrowserContext(testing_profile_));
     ASSERT_TRUE(testing_profile_->CreateHistoryService(true, false));
     service_.reset(new AndroidHistoryProviderService(testing_profile_));
   }
 
   void TearDown() override {
     testing_profile_->DestroyHistoryService();
     profile_manager_.DeleteTestingProfile(chrome::kInitialProfile);
     testing_profile_ = nullptr;
   }
 
  protected:
   TestingProfileManager profile_manager_;
-  base::MessageLoop message_loop_;
-  content::TestBrowserThread ui_thread_;
-  content::TestBrowserThread file_thread_;
+  content::TestBrowserThreadBundle test_browser_thread_bundle_;
   std::unique_ptr<AndroidHistoryProviderService> service_;
   base::CancelableTaskTracker cancelable_tracker_;
   TestingProfile* testing_profile_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(AndroidHistoryProviderServiceTest);
 };
 
 class CallbackHelper : public base::RefCountedThreadSafe<CallbackHelper> {
  public:
@@ skipping 201 matching lines @@
   service_->DeleteSearchTerms(std::string(),
                               std::vector<base::string16>(),
                               Bind(&CallbackHelper::OnDeleted, callback.get()),
                               &cancelable_tracker_);
   RunMessageLoop(callback.get());
   EXPECT_TRUE(callback->success());
   EXPECT_EQ(1, callback->count());
 }
 
 }  // namespace