Switch from TestBrowserThread to TestBrowserThreadBundle in chrome.

chrome/browser/password_manager/password_store_win_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/password_manager/password_store_win.h"
 
 #include <windows.h>
 
 #include <memory>
 #include <string>
@@ skipping 13 matching lines @@
 #include "base/time/time.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/os_crypt/ie7_password_win.h"
 #include "components/password_manager/core/browser/password_manager_test_utils.h"
 #include "components/password_manager/core/browser/password_store_consumer.h"
 #include "components/password_manager/core/browser/webdata/logins_table.h"
 #include "components/password_manager/core/browser/webdata/password_web_data_service_win.h"
 #include "components/password_manager/core/common/password_manager_pref_names.h"
 #include "components/prefs/pref_service.h"
 #include "components/webdata/common/web_database_service.h"
-#include "content/public/test/test_browser_thread.h"
+#include "content/public/browser/browser_thread.h"
+#include "content/public/test/test_browser_thread_bundle.h"
 #include "crypto/wincrypt_shim.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using autofill::PasswordForm;
 using base::WaitableEvent;
 using content::BrowserThread;
 using password_manager::LoginDatabase;
 using password_manager::PasswordFormData;
 using password_manager::PasswordStore;
@@ skipping 27 matching lines @@
                                    std::unique_ptr<WDTypedResult> result) {
     OnWebDataServiceRequestDoneStub();
   }
 };
 
 }  // anonymous namespace
 
 class PasswordStoreWinTest : public testing::Test {
  protected:
   PasswordStoreWinTest()
-      : ui_thread_(BrowserThread::UI, &message_loop_),
-        db_thread_(BrowserThread::DB) {}
+      : test_browser_thread_bundle_(
+            content::TestBrowserThreadBundle::REAL_DB_THREAD) {}
 
   bool CreateIE7PasswordInfo(const std::wstring& url,
                              const base::Time& created,
                              IE7PasswordInfo* info) {
     // Copied from chrome/browser/importer/importer_unittest.cc
     // The username is "abcdefgh" and the password "abcdefghijkl".
     unsigned char data[] =
         "\x0c\x00\x00\x00\x38\x00\x00\x00\x2c\x00\x00\x00"
         "\x57\x49\x43\x4b\x18\x00\x00\x00\x02\x00\x00\x00"
         "\x67\x00\x72\x00\x01\x00\x00\x00\x00\x00\x00\x00"
@@ skipping 27 matching lines @@
     LocalFree(output.pbData);
 
     info->url_hash = ie7_password::GetUrlHash(url);
     info->encrypted_data = encrypted_data;
     info->date_created = created;
 
     return true;
   }
 
   void SetUp() override {
-    ASSERT_TRUE(db_thread_.Start());
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
 
     profile_.reset(new TestingProfile());
 
     base::FilePath path = temp_dir_.GetPath().AppendASCII("web_data_test");
     wdbs_ = new WebDatabaseService(
         path, BrowserThread::GetTaskRunnerForThread(BrowserThread::UI),
         BrowserThread::GetTaskRunnerForThread(BrowserThread::DB));
     // Need to add at least one table so the database gets created.
     wdbs_->AddTable(std::unique_ptr<WebDatabaseTable>(new LoginsTable()));
@@ skipping 14 matching lines @@
     if (wdbs_) {
       wdbs_->ShutdownDatabase();
       wdbs_ = nullptr;
     }
     base::WaitableEvent done(base::WaitableEvent::ResetPolicy::AUTOMATIC,
                              base::WaitableEvent::InitialState::NOT_SIGNALED);
     BrowserThread::PostTask(
         BrowserThread::DB, FROM_HERE,
         base::Bind(&base::WaitableEvent::Signal, base::Unretained(&done)));
     done.Wait();
-    base::ThreadTaskRunnerHandle::Get()->PostTask(
-        FROM_HERE, base::MessageLoop::QuitWhenIdleClosure());
-    base::RunLoop().Run();
-    db_thread_.Stop();
   }
 
   base::FilePath test_login_db_file_path() const {
     return temp_dir_.GetPath().Append(FILE_PATH_LITERAL("login_test"));
   }
 
   PasswordStoreWin* CreatePasswordStore() {
     return new PasswordStoreWin(
         base::ThreadTaskRunnerHandle::Get(),
         BrowserThread::GetTaskRunnerForThread(BrowserThread::DB),
         base::MakeUnique<LoginDatabase>(test_login_db_file_path()), wds_.get());
   }
 
-  base::MessageLoopForUI message_loop_;
-  content::TestBrowserThread ui_thread_;
-  // PasswordStore, WDS schedule work on this thread.
-  content::TestBrowserThread db_thread_;
+  content::TestBrowserThreadBundle test_browser_thread_bundle_;
 
   base::ScopedTempDir temp_dir_;
   std::unique_ptr<TestingProfile> profile_;
   scoped_refptr<PasswordWebDataService> wds_;
   scoped_refptr<WebDatabaseService> wdbs_;
   scoped_refptr<PasswordStore> store_;
 };
 
 ACTION(QuitUIMessageLoop) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
@@ skipping 250 matching lines @@
 
   // Make sure we quit the MessageLoop even if the test fails.
   ON_CALL(consumer, OnGetPasswordStoreResultsConstRef(_))
       .WillByDefault(QuitUIMessageLoop());
 
   EXPECT_CALL(consumer, OnGetPasswordStoreResultsConstRef(IsEmpty()));
 
   store_->GetAutofillableLogins(&consumer);
   base::RunLoop().Run();
 }