Switch from TestBrowserThread to TestBrowserThreadBundle in chrome.

chrome/browser/history/android/sqlite_cursor_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/sqlite_cursor.h"
 
 #include <jni.h>
 #include <stdint.h>
 
 #include "base/android/jni_android.h"
@@ skipping 10 matching lines @@
 #include "chrome/browser/history/history_service_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 "components/history/core/browser/android/android_time.h"
 #include "components/history/core/browser/history_service.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 "content/public/test/test_utils.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 test the JNI interface which will be
 // covered in Java tests.
 class SQLiteCursorTest : public testing::Test,
                          public SQLiteCursor::TestObserver {
  public:
-  SQLiteCursorTest()
-      : profile_manager_(
-          TestingBrowserProcess::GetGlobal()),
-        ui_thread_(BrowserThread::UI, &message_loop_),
-        file_thread_(BrowserThread::FILE, &message_loop_) {
-  }
+  SQLiteCursorTest() : profile_manager_(TestingBrowserProcess::GetGlobal()) {}
   ~SQLiteCursorTest() 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(
@@ skipping 36 matching lines @@
     run_loop_ = nullptr;
   }
 
   void OnGetFaviconResult() override {
     ASSERT_TRUE(run_loop_);
     run_loop_->QuitWhenIdle();
   }
 
  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_;
   history::HistoryService* hs_;
   std::unique_ptr<base::RunLoop> run_loop_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(SQLiteCursorTest);
 };
 
@@ skipping 102 matching lines @@
       cursor->GetBlob(env, NULL, 3);
   std::vector<uint8_t> out;
   base::android::JavaByteArrayToByteVector(env, data.obj(), &out);
   EXPECT_EQ(data_bytes->data().size(), out.size());
   EXPECT_EQ(data_bytes->data()[0], out[0]);
   cursor->Destroy(env, NULL);
   // Cursor::Destroy posts the task in UI thread, run Message loop to release
   // the statement, delete SQLiteCursor itself etc.
   content::RunAllPendingInMessageLoop();
 }