Switch from TestBrowserThread to TestBrowserThreadBundle in chrome.

chrome/browser/password_manager/password_store_mac_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_mac.h"
 
 #include <stddef.h>
 
 #include <string>
 
 #include "base/files/scoped_temp_dir.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/run_loop.h"
 #include "base/scoped_observer.h"
 #include "base/stl_util.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/test/histogram_tester.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "chrome/browser/password_manager/password_store_mac_internal.h"
 #include "chrome/common/chrome_paths.h"
 #include "components/os_crypt/os_crypt_mocker.h"
 #include "components/password_manager/core/browser/login_database.h"
 #include "components/password_manager/core/browser/password_manager_test_utils.h"
 #include "components/password_manager/core/browser/password_manager_util.h"
 #include "components/password_manager/core/browser/password_store_consumer.h"
 #include "components/password_manager/core/browser/password_store_origin_unittest.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 "content/public/test/test_utils.h"
 #include "crypto/mock_apple_keychain.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/origin.h"
 
 using autofill::PasswordForm;
 using base::ASCIIToUTF16;
 using base::WideToUTF16;
 using content::BrowserThread;
@@ skipping 1203 matching lines @@
 
   std::vector<std::unique_ptr<PasswordForm>> owned_passwords =
       owned_keychain_adapter.GetAllPasswordFormPasswords();
   EXPECT_EQ(arraysize(owned_password_data), owned_passwords.size());
 }
 
 #pragma mark -
 
 class PasswordStoreMacTest : public testing::Test {
  public:
-  PasswordStoreMacTest() : ui_thread_(BrowserThread::UI, &message_loop_) {}
+  PasswordStoreMacTest() = default;
 
   void SetUp() override {
     ASSERT_TRUE(db_dir_.CreateUniqueTempDir());
     histogram_tester_.reset(new base::HistogramTester);
 
     // Ensure that LoginDatabase will use the mock keychain if it needs to
     // encrypt/decrypt a password.
     OSCryptMocker::SetUpWithSingleton();
     login_db_.reset(
         new password_manager::LoginDatabase(test_login_db_file_path()));
@@ skipping 110 matching lines @@
     scoped_refptr<content::MessageLoopRunner> runner =
         new content::MessageLoopRunner;
     ASSERT_TRUE(thread_->task_runner()->PostTaskAndReply(
         FROM_HERE, base::Bind(&Noop), runner->QuitClosure()));
     runner->Run();
   }
 
   PasswordStoreMac* store() { return store_.get(); }
 
  protected:
-  base::MessageLoopForUI message_loop_;
-  content::TestBrowserThread ui_thread_;
+  content::TestBrowserThreadBundle test_browser_thread_bundle_;
   // Thread that the synchronous methods are run on.
   std::unique_ptr<base::Thread> thread_;
 
   base::ScopedTempDir db_dir_;
   std::unique_ptr<password_manager::LoginDatabase> login_db_;
   scoped_refptr<PasswordStoreMac> store_;
   std::unique_ptr<base::HistogramTester> histogram_tester_;
 };
 
 TEST_F(PasswordStoreMacTest, TestStoreUpdate) {
@@ skipping 706 matching lines @@
       keychain_adapter.GetAllPasswordFormPasswords();
   EXPECT_EQ(2u, passwords.size());
 
   // Delete everyhting but only the Chrome-owned item should be affected.
   PasswordStoreMac::CleanUpKeychain(keychain(), passwords);
   passwords = keychain_adapter.GetAllPasswordFormPasswords();
   ASSERT_EQ(1u, passwords.size());
   EXPECT_EQ("http://some.domain.com/", passwords[0]->signon_realm);
   EXPECT_EQ(ASCIIToUTF16("sekrit"), passwords[0]->password_value);
 }