Fix TestBrowserThread destruction order in Android history tests.

chrome/browser/history/android/bookmark_model_sql_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/history/android/bookmark_model_sql_handler.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "base/synchronization/waitable_event.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/profiles/profile_manager.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/browser/bookmark_model.h"
 #include "components/bookmarks/test/bookmark_test_helpers.h"
 #include "components/history/core/browser/history_constants.h"
 #include "components/history/core/browser/history_database.h"
 #include "components/history/core/test/test_history_database.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"
 
 using bookmarks::BookmarkModel;
 using bookmarks::BookmarkNode;
 using content::BrowserThread;
 
 namespace history {
 
 class BookmarkModelSQLHandlerTest : public testing::Test {
  public:
   BookmarkModelSQLHandlerTest()
       : profile_manager_(TestingBrowserProcess::GetGlobal()),
-        bookmark_model_(NULL),
-        ui_thread_(BrowserThread::UI, &message_loop_),
-        file_thread_(BrowserThread::FILE, &message_loop_) {}
+        bookmark_model_(NULL) {}
   ~BookmarkModelSQLHandlerTest() 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().
     TestingProfile* testing_profile = profile_manager_.CreateTestingProfile(
@@ skipping 15 matching lines @@
         temp_dir_.GetPath().AppendASCII(kHistoryFilename);
     history_db_.Init(history_db_name);
   }
 
   // Runs the MessageLoopForUI, and return till all pending messages were
   // processed.
   void RunMessageLoopForUI() {
     content::RunAllPendingInMessageLoop();
   }
 
+  content::TestBrowserThreadBundle thread_bundle_;
+
   TestingProfileManager profile_manager_;
   BookmarkModel* bookmark_model_;
-  base::MessageLoopForUI message_loop_;
-  content::TestBrowserThread ui_thread_;
-  content::TestBrowserThread file_thread_;
   base::ScopedTempDir temp_dir_;
   TestHistoryDatabase history_db_;
 };
 
 TEST_F(BookmarkModelSQLHandlerTest, InsertIntoMobileFolder) {
   HistoryAndBookmarkRow row;
   row.set_raw_url("http://bookmark.com");
   row.set_url(GURL("http://bookmark.com"));
   row.set_title(base::UTF8ToUTF16("Bookmark Title"));
   row.set_is_bookmark(true);
@@ skipping 159 matching lines @@
   id_row.url = url1;
   id_rows.clear();
   id_rows.push_back(id_row);
   ASSERT_TRUE(handler.Delete(id_rows));
   RunMessageLoopForUI();
   // All bookmarks were deleted.
   EXPECT_FALSE(bookmark_model_->HasBookmarks());
 }
 
 }  // namespace history