Switch from TestBrowserThread to TestBrowserThreadBundle in chrome.

chrome/browser/component_updater/component_installers_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 <memory>
 
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/json/json_file_value_serializer.h"
-#include "base/message_loop/message_loop.h"
 #include "base/path_service.h"
 #include "base/version.h"
 #include "build/build_config.h"
 #include "chrome/browser/component_updater/pepper_flash_component_installer.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/pepper_flash.h"
-#include "content/public/test/test_browser_thread.h"
+#include "content/public/test/test_browser_thread_bundle.h"
 #include "ppapi/shared_impl/test_globals.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-using content::BrowserThread;
-
 namespace component_updater {
 
 namespace {
 // File name of the Pepper Flash plugin on different platforms.
 const base::FilePath::CharType kDataPath[] =
 #if defined(OS_MACOSX)
 #if defined(ARCH_CPU_X86)
     FILE_PATH_LITERAL("components/flapper/mac");
 #elif defined(ARCH_CPU_X86_64)
     FILE_PATH_LITERAL("components/flapper/mac_x64");
@@ skipping 24 matching lines @@
 #elif defined(ARCH_CPU_X86_64)
     FILE_PATH_LITERAL("components/flapper/linux_x64");
 #else
     FILE_PATH_LITERAL("components/flapper/NONEXISTENT");
 #endif
 #endif
 }  // namespace
 
 // TODO(viettrungluu): Separate out into two separate tests; use a test fixture.
 TEST(ComponentInstallerTest, PepperFlashCheck) {
-  base::MessageLoop message_loop;
-  content::TestBrowserThread ui_thread(BrowserThread::UI, &message_loop);
+  content::TestBrowserThreadBundle test_browser_thread_bundle;
 
   ppapi::PpapiGlobals::PerThreadForTest per_thread_for_test;
   ppapi::TestGlobals test_globals(per_thread_for_test);
   ppapi::PpapiGlobals::SetPpapiGlobalsOnThreadForTest(&test_globals);
 
   // The test directory is chrome/test/data/components/flapper.
   base::FilePath manifest;
   PathService::Get(chrome::DIR_TEST_DATA, &manifest);
   manifest = manifest.Append(kDataPath);
   manifest = manifest.AppendASCII("manifest.json");
@@ skipping 12 matching lines @@
   ASSERT_TRUE(root);
   ASSERT_TRUE(root->IsType(base::Value::Type::DICTIONARY));
 
   // This checks that the whole manifest is compatible.
   base::Version version;
   EXPECT_TRUE(chrome::CheckPepperFlashManifest(*root, &version));
   EXPECT_TRUE(version.IsValid());
 }
 
 }  // namespace component_updater