Switch from TestBrowserThread to TestBrowserThreadBundle in chrome.

chrome/browser/printing/cloud_print/cloud_print_proxy_service_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/printing/cloud_print/cloud_print_proxy_service.h"
 
 #include <stdint.h>
 
 #include <memory>
 #include <string>
 
 #include "base/command_line.h"
 #include "base/location.h"
 #include "base/memory/ptr_util.h"
-#include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/single_thread_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service_factory.h"
 #include "chrome/browser/service_process/service_process_control.h"
 #include "chrome/browser/ui/startup/startup_browser_creator.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/cloud_print/cloud_print_proxy_info.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/service_messages.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/prefs/testing_pref_service.h"
 #include "components/sync_preferences/testing_pref_service_syncable.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 "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using ::testing::Assign;
 using ::testing::AtMost;
 using ::testing::DeleteArg;
 using ::testing::DoAll;
 using ::testing::Invoke;
 using ::testing::Property;
 using ::testing::Return;
@@ skipping 156 matching lines @@
                            MockServiceProcessControl::EnabledUserId(),
                            base::DictionaryValue());
   }
 
  private:
   MockServiceProcessControl process_control_;
 };
 
 class CloudPrintProxyPolicyTest : public ::testing::Test {
  public:
-  CloudPrintProxyPolicyTest()
-      : ui_thread_(content::BrowserThread::UI, &message_loop_) {
-  }
+  CloudPrintProxyPolicyTest() = default;
 
   bool LaunchBrowser(const base::CommandLine& command_line, Profile* profile) {
     StartupBrowserCreator browser_creator;
     return browser_creator.ProcessCmdLineImpl(
         command_line, base::FilePath(), false, profile,
         StartupBrowserCreator::Profiles());
   }
 
  protected:
-  base::MessageLoopForUI message_loop_;
-  content::TestBrowserThread ui_thread_;
+  content::TestBrowserThreadBundle test_browser_thread_bundle_;
   TestingProfile profile_;
 };
 
 TEST_F(CloudPrintProxyPolicyTest, VerifyExpectations) {
   MockServiceProcessControl mock_control;
   mock_control.SetConnectSuccessMockExpectations(
       MockServiceProcessControl::kServiceStateNone, false);
 
   EXPECT_FALSE(mock_control.IsConnected());
   mock_control.Launch(base::Closure(), base::Closure());
@@ skipping 210 matching lines @@
 
   prefs->RemoveManagedPref(prefs::kCloudPrintProxyEnabled);
   EXPECT_EQ(std::string(), prefs->GetString(prefs::kCloudPrintEmail));
 
   service.GetMockServiceProcessControl()->SetWillBeEnabledExpectations();
   service.EnableForUser();
 
   EXPECT_EQ(MockServiceProcessControl::EnabledUserId(),
             prefs->GetString(prefs::kCloudPrintEmail));
 }