Add TestBrowserThreadBundle into RenderViewHostTestHarness. Kill some unnecessary real threads.

chrome/browser/extensions/script_badge_controller_unittest.cc

Index: chrome/browser/extensions/script_badge_controller_unittest.cc
diff --git a/chrome/browser/extensions/script_badge_controller_unittest.cc b/chrome/browser/extensions/script_badge_controller_unittest.cc
index 14ada0789d812e5c8c26244f91a9c0decf272029..f28f3e8e221037ec878af4cf653333f599e28804 100644
--- a/chrome/browser/extensions/script_badge_controller_unittest.cc
+++ b/chrome/browser/extensions/script_badge_controller_unittest.cc
@@ -37,8 +37,6 @@
 #include "chrome/browser/chromeos/settings/device_settings_service.h"
 #endif
 
-using content::BrowserThread;
-
 namespace extensions {
 namespace {
 
@@ -46,8 +44,6 @@ class ScriptBadgeControllerTest : public ChromeRenderViewHostTestHarness {
  public:
   ScriptBadgeControllerTest()
       : feature_override_(FeatureSwitch::script_badges(), true),
-        ui_thread_(BrowserThread::UI, base::MessageLoop::current()),
-        file_thread_(BrowserThread::FILE, base::MessageLoop::current()),
         current_channel_(chrome::VersionInfo::CHANNEL_DEV) {}
 
   virtual void SetUp() OVERRIDE {
@@ -56,6 +52,10 @@ class ScriptBadgeControllerTest : public ChromeRenderViewHostTestHarness {
     // not use that for testing.
     ChromeRenderViewHostTestHarness::SetUp();
 
+#if defined OS_CHROMEOS
+  test_user_manager_.reset(new chromeos::ScopedTestUserManager());
+#endif
+
     Profile* profile =
         Profile::FromBrowserContext(web_contents()->GetBrowserContext());
     TestExtensionSystem* extension_system =
@@ -72,6 +72,13 @@ class ScriptBadgeControllerTest : public ChromeRenderViewHostTestHarness {
         TabHelper::FromWebContents(web_contents())->location_bar_controller());
   }
 
+  virtual void TearDown() OVERRIDE {
+#if defined OS_CHROMEOS
+    test_user_manager_.reset();
+#endif
+    ChromeRenderViewHostTestHarness::TearDown();
+  }
+
  protected:
   // Creates a test extension and adds it to |extension_service_|.
   scoped_refptr<const Extension> AddTestExtension() {
@@ -98,14 +105,12 @@ class ScriptBadgeControllerTest : public ChromeRenderViewHostTestHarness {
 
  private:
   FeatureSwitch::ScopedOverride feature_override_;
-  content::TestBrowserThread ui_thread_;
-  content::TestBrowserThread file_thread_;
   Feature::ScopedCurrentChannel current_channel_;
 
 #if defined OS_CHROMEOS
   chromeos::ScopedTestDeviceSettingsService test_device_settings_service_;
   chromeos::ScopedTestCrosSettings test_cros_settings_;
-  chromeos::ScopedTestUserManager test_user_manager_;
+  scoped_ptr<chromeos::ScopedTestUserManager> test_user_manager_;
 #endif
 };