Fix TestBrowserThread destruction order in Android history tests.

chrome/browser/history/android/android_provider_backend_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_provider_backend.h"
 
 #include <vector>
 
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
+#include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
+#include "base/threading/thread_task_runner_handle.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/history/chrome_history_client.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/android/android_time.h"
 #include "components/history/core/browser/history_backend.h"
 #include "components/history/core/browser/history_backend_client.h"
 #include "components/history/core/browser/history_constants.h"
 #include "components/history/core/browser/history_database_params.h"
 #include "components/history/core/browser/keyword_search_term.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"
 #include "third_party/skia/include/core/SkBitmap.h"
 
 using base::Time;
 using base::TimeDelta;
 using base::UTF8ToUTF16;
 using bookmarks::BookmarkModel;
 using bookmarks::BookmarkNode;
 using content::BrowserThread;
@@ skipping 120 matching lines @@
   std::unique_ptr<std::set<GURL>> favicon_changed_;
 
   DISALLOW_COPY_AND_ASSIGN(AndroidProviderBackendNotifier);
 };
 
 class AndroidProviderBackendTest : public testing::Test {
  public:
   AndroidProviderBackendTest()
       : thumbnail_db_(NULL),
         profile_manager_(TestingBrowserProcess::GetGlobal()),
-        bookmark_model_(NULL),
-        ui_thread_(BrowserThread::UI, &message_loop_),
-        file_thread_(BrowserThread::FILE, &message_loop_) {}
-  ~AndroidProviderBackendTest() override {}
+        bookmark_model_(NULL) {}
+
+  ~AndroidProviderBackendTest() override {
+    // Avoid use after frees by running any unhandled tasks before freeing this
+    // fixture's members.
+    base::RunLoop().RunUntilIdle();
+  }
 
  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(
         chrome::kInitialProfile);
@@ skipping 51 matching lines @@
       row.create_time_ = FromDatabaseTime(statement.ColumnInt64(0));
       row.last_visit_time_ = FromDatabaseTime(statement.ColumnInt64(1));
       row.url_id_ = statement.ColumnInt64(2);
       row.bookmark_ = statement.ColumnBool(3);
       row.favicon_id_ = statement.ColumnInt64(4);
       rows->push_back(row);
     }
     return true;
   }
 
+  content::TestBrowserThreadBundle thread_bundle_;
+
   AndroidProviderBackendNotifier notifier_;
   scoped_refptr<HistoryBackend> history_backend_;
   TestHistoryDatabase history_db_;
   ThumbnailDatabase thumbnail_db_;
   base::ScopedTempDir temp_dir_;
   base::FilePath android_cache_db_name_;
   base::FilePath history_db_name_;
   base::FilePath thumbnail_db_name_;
 
   TestingProfileManager profile_manager_;
   BookmarkModel* bookmark_model_;
-  base::MessageLoopForUI message_loop_;
-  content::TestBrowserThread ui_thread_;
-  content::TestBrowserThread file_thread_;
   std::unique_ptr<history::HistoryClient> history_client_;
   std::unique_ptr<history::HistoryBackendClient> history_backend_client_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(AndroidProviderBackendTest);
 };
 
 TEST_F(AndroidProviderBackendTest, IgnoreAboutBlank) {
   GURL url("about:blank");
   ASSERT_FALSE(history_client_->CanAddURL(url));
@@ skipping 24 matching lines @@
   GURL url3("http://www.bookmark.com");
   base::string16 title3(UTF8ToUTF16("bookmark"));
   ASSERT_TRUE(bookmark_model_->AddURL(bookmark_model_->bookmark_bar_node(), 0,
                                       title3, url3));
   // Only use the HistoryBackend to generate the test data.
   // HistoryBackend will shutdown after that.
   {
   scoped_refptr<HistoryBackend> history_backend;
   history_backend = new HistoryBackend(new AndroidProviderBackendDelegate(),
                                        history_client_->CreateBackendClient(),
-                                       message_loop_.task_runner());
+                                       base::ThreadTaskRunnerHandle::Get());
   history_backend->Init(false,
                         TestHistoryDatabaseParamsForPath(temp_dir_.GetPath()));
   history_backend->AddVisits(url1, visits1, history::SOURCE_SYNCED);
   history_backend->AddVisits(url2, visits2, history::SOURCE_SYNCED);
   URLRow url_row;
 
   ASSERT_TRUE(history_backend->GetURL(url1, &url_row));
   url_id1 = url_row.id();
   ASSERT_TRUE(history_backend->GetURL(url2, &url_row));
   url_id2 = url_row.id();
@@ skipping 115 matching lines @@
   visits2.push_back(VisitInfo(last_visited2 - TimeDelta::FromDays(5),
                               ui::PAGE_TRANSITION_LINK));
   visits2.push_back(VisitInfo(last_visited2, ui::PAGE_TRANSITION_LINK));
 
   // Only use the HistoryBackend to generate the test data.
   // HistoryBackend will shutdown after that.
   {
   scoped_refptr<HistoryBackend> history_backend;
   history_backend = new HistoryBackend(new AndroidProviderBackendDelegate(),
                                        history_client_->CreateBackendClient(),
-                                       message_loop_.task_runner());
+                                       base::ThreadTaskRunnerHandle::Get());
   history_backend->Init(false,
                         TestHistoryDatabaseParamsForPath(temp_dir_.GetPath()));
   history_backend->AddVisits(url1, visits1, history::SOURCE_SYNCED);
   history_backend->AddVisits(url2, visits2, history::SOURCE_SYNCED);
 
   history::URLRows url_rows(2u);
   ASSERT_TRUE(history_backend->GetURL(url1, &url_rows[0]));
   ASSERT_TRUE(history_backend->GetURL(url2, &url_rows[1]));
   url_rows[0].set_title(title1);
   url_rows[1].set_title(title2);
@@ skipping 1367 matching lines @@
   visits2.push_back(VisitInfo(last_visited2 - TimeDelta::FromDays(5),
                               ui::PAGE_TRANSITION_LINK));
   visits2.push_back(VisitInfo(last_visited2, ui::PAGE_TRANSITION_LINK));
 
   // Only use the HistoryBackend to generate the test data.
   // HistoryBackend will shutdown after that.
   {
   scoped_refptr<HistoryBackend> history_backend;
   history_backend = new HistoryBackend(new AndroidProviderBackendDelegate(),
                                        history_client_->CreateBackendClient(),
-                                       message_loop_.task_runner());
+                                       base::ThreadTaskRunnerHandle::Get());
   history_backend->Init(false,
                         TestHistoryDatabaseParamsForPath(temp_dir_.GetPath()));
   history_backend->AddVisits(url1, visits1, history::SOURCE_SYNCED);
   history_backend->AddVisits(url2, visits2, history::SOURCE_SYNCED);
   URLRow url_row;
 
   history::URLRows url_rows(2u);
   ASSERT_TRUE(history_backend->GetURL(url1, &url_rows[0]));
   ASSERT_TRUE(history_backend->GetURL(url2, &url_rows[1]));
   url_rows[0].set_title(title1);
@@ skipping 252 matching lines @@
                                                  update_args, &update_count));
   // Verify notifications.
   EXPECT_FALSE(notifier_.deleted_details());
   ASSERT_TRUE(notifier_.modified_details());
   ASSERT_EQ(1u, notifier_.modified_details()->size());
   // No favicon will be updated as thumbnail database is missing.
   EXPECT_FALSE(notifier_.favicon_changed());
 }
 
 }  // namespace history