Switch from TestBrowserThread to TestBrowserThreadBundle in chrome.

chrome/browser/content_settings/host_content_settings_map_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 <string>
 #include <utility>
 
 #include "base/auto_reset.h"
 #include "base/command_line.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/memory/ptr_util.h"
-#include "base/message_loop/message_loop.h"
 #include "chrome/browser/content_settings/content_settings_mock_observer.h"
 #include "chrome/browser/content_settings/cookie_settings_factory.h"
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
 #include "chrome/browser/content_settings/mock_settings_observer.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/content_settings/core/browser/content_settings_details.h"
 #include "components/content_settings/core/browser/cookie_settings.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "components/content_settings/core/browser/website_settings_info.h"
 #include "components/content_settings/core/browser/website_settings_registry.h"
 #include "components/content_settings/core/common/pref_names.h"
 #include "components/prefs/pref_service.h"
 #include "components/prefs/scoped_user_pref_update.h"
 #include "components/sync_preferences/testing_pref_service_syncable.h"
-#include "content/public/test/test_browser_thread.h"
+#include "content/public/test/test_browser_thread_bundle.h"
 #include "net/base/static_cookie_policy.h"
 #include "ppapi/features/features.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"
 
-using content::BrowserThread;
-
 using ::testing::_;
 
 namespace {
 
 bool MatchPrimaryPattern(const ContentSettingsPattern& expected_primary,
                          const ContentSettingsPattern& primary_pattern,
                          const ContentSettingsPattern& secondary_pattern) {
   return expected_primary == primary_pattern;
 }
 
 }  // namespace
 
 class HostContentSettingsMapTest : public testing::Test {
  public:
-  HostContentSettingsMapTest() : ui_thread_(BrowserThread::UI, &message_loop_) {
-  }
+  HostContentSettingsMapTest() = default;
 
  protected:
   const std::string& GetPrefName(ContentSettingsType type) {
     return content_settings::WebsiteSettingsRegistry::GetInstance()
         ->Get(type)
         ->pref_name();
   }
 
-  base::MessageLoop message_loop_;
-  content::TestBrowserThread ui_thread_;
+  content::TestBrowserThreadBundle test_browser_thread_bundle_;
 };
 
 // Wrapper to TestingProfile to reduce test boilerplates, by keeping a fixed
 // |content_type| so caller only need to specify it once.
 class TesterForType {
  public:
   TesterForType(TestingProfile *profile, ContentSettingsType content_type)
       : prefs_(profile->GetTestingPrefService()),
         host_content_settings_map_(
             HostContentSettingsMapFactory::GetForProfile(profile)),
@@ skipping 1676 matching lines @@
   GURL valid_url("http://google.com");
   EXPECT_TRUE(map->CanSetNarrowestContentSetting(
       valid_url, valid_url,
       CONTENT_SETTINGS_TYPE_POPUPS));
 
   GURL invalid_url("about:blank");
   EXPECT_FALSE(map->CanSetNarrowestContentSetting(
       invalid_url, invalid_url,
       CONTENT_SETTINGS_TYPE_POPUPS));
 }
-