Add TestBrowserThreadBundle into RenderViewHostTestHarness. Kill some unnecessary real threads.

chrome/browser/ui/ash/launcher/browser_launcher_item_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 "chrome/browser/ui/ash/launcher/browser_launcher_item_controller.h"
 
 #include <map>
 #include <string>
 
 #include "ash/ash_switches.h"
 #include "ash/launcher/launcher_model.h"
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/favicon/favicon_tab_helper.h"
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
 #include "chrome/browser/ui/ash/launcher/launcher_item_controller.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/tabs/test_tab_strip_model_delegate.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/browser/web_contents.h"
-#include "content/public/test/test_browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/aura/client/activation_change_observer.h"
 #include "ui/aura/client/activation_delegate.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/test/test_activation_client.h"
 #include "ui/aura/test/test_window_delegate.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_delegate.h"
@@ skipping 93 matching lines @@
 
 }  // namespace
 
 // TODO(skuhne): Several of these unit tests need to be moved into a new home
 // when the old launcher & the browser launcher item controller are removed
 // (several of these tests are not testing the BrowserLauncherItemController -
 // but the LauncherController framework).
 class LauncherItemControllerPerAppTest
     : public ChromeRenderViewHostTestHarness {
  public:
-  LauncherItemControllerPerAppTest()
-      : browser_thread_(content::BrowserThread::UI, &message_loop_) {
-  }
-
   virtual void SetUp() OVERRIDE {
     ChromeRenderViewHostTestHarness::SetUp();
 
     activation_client_.reset(
         new aura::test::TestActivationClient(root_window()));
     launcher_model_.reset(new ash::LauncherModel);
     launcher_delegate_.reset(
         ChromeLauncherController::CreateInstance(profile(),
                                                  launcher_model_.get()));
     app_tab_helper_ = new AppTabHelperImpl;
@@ skipping 84 matching lines @@
   }
 
   scoped_ptr<ash::LauncherModel> launcher_model_;
   scoped_ptr<ChromeLauncherController> launcher_delegate_;
 
   // Owned by BrowserLauncherItemController.
   AppTabHelperImpl* app_tab_helper_;
   AppIconLoaderImpl* app_icon_loader_;
 
   scoped_ptr<aura::test::TestActivationClient> activation_client_;
-
- private:
-  content::TestBrowserThread browser_thread_;
-
-  DISALLOW_COPY_AND_ASSIGN(LauncherItemControllerPerAppTest);
 };
 
 // Verify that the launcher item positions are persisted and restored.
 TEST_F(LauncherItemControllerPerAppTest, PersistLauncherItemPositions) {
   EXPECT_EQ(ash::TYPE_BROWSER_SHORTCUT,
             launcher_model_->items()[0].type);
   EXPECT_EQ(ash::TYPE_APP_LIST,
             launcher_model_->items()[1].type);
   scoped_ptr<content::WebContents> tab1(CreateTestWebContents());
   scoped_ptr<content::WebContents> tab2(CreateTestWebContents());
@@ skipping 52 matching lines @@
   virtual void SetUp() OVERRIDE {
     CommandLine::ForCurrentProcess()->AppendSwitch(
         ash::switches::kAshDisablePerAppLauncher);
 
     LauncherItemControllerPerAppTest::SetUp();
   }
 
   virtual void TearDown() OVERRIDE {
     LauncherItemControllerPerAppTest::TearDown();
   }
-
-  DISALLOW_COPY_AND_ASSIGN(BrowserLauncherItemControllerTest);
 };
 
 // Verifies a new launcher item is added for TYPE_TABBED.
 TEST_F(BrowserLauncherItemControllerTest, TabbedSetup) {
   size_t initial_size = launcher_model_->items().size();
   {
     scoped_ptr<content::WebContents> web_contents(CreateTestWebContents());
     State state(this, std::string(),
                 BrowserLauncherItemController::TYPE_TABBED);
 
@@ skipping 211 matching lines @@
   EXPECT_EQ(ash::STATUS_RUNNING, app_state.GetUpdaterItem().status);
 
   // App window should go to attention state.
   app_state.window.SetProperty(aura::client::kDrawAttentionKey, true);
   EXPECT_EQ(ash::STATUS_ATTENTION, app_state.GetUpdaterItem().status);
 
   // Activating app window should clear attention state.
   activation_client_->ActivateWindow(&app_state.window);
   EXPECT_EQ(ash::STATUS_ACTIVE, app_state.GetUpdaterItem().status);
 }