Switch from TestBrowserThread to TestBrowserThreadBundle in chrome.

chrome/browser/themes/browser_theme_pack_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/themes/browser_theme_pack.h"
 
 #include <stddef.h>
 
 #include "base/files/scoped_temp_dir.h"
 #include "base/json/json_file_value_serializer.h"
 #include "base/json/json_reader.h"
-#include "base/message_loop/message_loop.h"
 #include "base/path_service.h"
 #include "base/values.h"
 #include "build/build_config.h"
 #include "chrome/browser/themes/theme_properties.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/grit/theme_resources.h"
-#include "content/public/test/test_browser_thread.h"
+#include "content/public/test/test_browser_thread_bundle.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/image/image_skia_rep.h"
 
-using content::BrowserThread;
 using extensions::Extension;
 
 // Maps scale factors (enum values) to file path.
 // A similar typedef in BrowserThemePack is private.
 typedef std::map<ui::ScaleFactor, base::FilePath> TestScaleFactorToFileMap;
 
 // Maps image ids to maps of scale factors to file paths.
 // A similar typedef in BrowserThemePack is private.
 typedef std::map<int, TestScaleFactorToFileMap> TestFilePathMap;
 
 class BrowserThemePackTest : public ::testing::Test {
  public:
-  BrowserThemePackTest()
-      : message_loop(),
-        fake_ui_thread(BrowserThread::UI, &message_loop),
-        fake_file_thread(BrowserThread::FILE, &message_loop) {
+  BrowserThemePackTest() {
     std::vector<ui::ScaleFactor> scale_factors;
     scale_factors.push_back(ui::SCALE_FACTOR_100P);
     scale_factors.push_back(ui::SCALE_FACTOR_200P);
     scoped_set_supported_scale_factors_.reset(
       new ui::test::ScopedSetSupportedScaleFactors(scale_factors));
     theme_pack_ = new BrowserThemePack();
   }
 
   // Transformation for link underline colors.
   SkColor BuildThirdOpacity(SkColor color_link) {
@@ skipping 292 matching lines @@
     EXPECT_EQ(160, rep4.sk_bitmap().height());
     // We expect the same colors and at locations scaled by 2
     // since this bitmap was scaled by 2.
     for (size_t i = 0; i < normal.size(); ++i) {
       int xy = 2 * normal[i].first;
       SkColor color = normal[i].second;
       EXPECT_EQ(color, rep4.sk_bitmap().getColor(xy, xy));
     }
   }
 
-  base::MessageLoop message_loop;
-  content::TestBrowserThread fake_ui_thread;
-  content::TestBrowserThread fake_file_thread;
+  content::TestBrowserThreadBundle test_browser_thread_bundle_;
 
   typedef std::unique_ptr<ui::test::ScopedSetSupportedScaleFactors>
       ScopedSetSupportedScaleFactors;
   ScopedSetSupportedScaleFactors scoped_set_supported_scale_factors_;
   scoped_refptr<BrowserThemePack> theme_pack_;
 };
 
 // 'ntp_section' used to correspond to ThemeProperties::COLOR_NTP_SECTION,
 // but COLOR_NTP_SECTION was since removed because it was never used.
 // While it was in use, COLOR_NTP_HEADER used 'ntp_section' as a fallback when
@@ skipping 238 matching lines @@
   }
 
   // Part 2: Try to read back the data pack that we just wrote to disk.
   {
     scoped_refptr<BrowserThemePack> pack =
         BrowserThemePack::BuildFromDataPack(file, "gllekhaobjnhgeag");
     ASSERT_TRUE(pack.get());
     VerifyHiDpiTheme(pack.get());
   }
 }