Add TestBrowserThreadBundle into RenderViewHostTestHarness. Kill some unnecessary real threads.

chrome/browser/extensions/script_badge_controller_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 <string>
 
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/stringprintf.h"
@@ skipping 19 matching lines @@
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/test_browser_thread.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chrome/browser/chromeos/settings/device_settings_service.h"
 #endif
 
-using content::BrowserThread;
-
 namespace extensions {
 namespace {
 
 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 {
     // Note that this sets a PageActionController into the
     // extensions::TabHelper's location_bar_controller field.  Do
     // 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 =
         static_cast<TestExtensionSystem*>(ExtensionSystem::Get(profile));
 
     // Create an ExtensionService so the ScriptBadgeController can find its
     // extensions.
     CommandLine command_line(CommandLine::NO_PROGRAM);
     extension_service_ = extension_system->CreateExtensionService(
         &command_line, base::FilePath(), false);
 
     TabHelper::CreateForWebContents(web_contents());
     script_badge_controller_ = static_cast<ScriptBadgeController*>(
         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() {
     scoped_refptr<const Extension> extension = ExtensionBuilder()
         .SetManifest(DictionaryBuilder()
             .Set("name", "Extension with page action")
             .Set("version", "1.0.0")
             .Set("manifest_version", 2)
             .Set("permissions", ListBuilder()
                 .Append("tabs"))
             .Set("page_action", DictionaryBuilder()
                 .Set("default_title", "Hello")))
         .Build();
     extension_service_->AddExtension(extension.get());
     return extension;
   }
 
   ExtensionAction* GetScriptBadge(const Extension& extension) {
     return ExtensionActionManager::Get(profile())->GetScriptBadge(extension);
   }
 
   ExtensionService* extension_service_;
   ScriptBadgeController* script_badge_controller_;
 
  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
 };
 
 struct CountingNotificationObserver : public content::NotificationObserver {
   CountingNotificationObserver() : events(0) {}
 
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE {
     events++;
@@ skipping 144 matching lines @@
   // Getting attention a second time should have no effect.
   script_badge_controller_->GetAttentionFor(extension->id());
 
   EXPECT_THAT(script_badge_controller_->GetCurrentActions(),
               testing::ElementsAre(GetScriptBadge(*extension.get())));
   EXPECT_EQ(0, subsequent_get_attention_call.events);
 };
 
 }  // namespace
 }  // namespace extensions