Add TestBrowserThreadBundle into RenderViewHostTestHarness. Kill some unnecessary real threads.

chrome/browser/ui/tabs/tab_strip_model_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/tabs/tab_strip_model.h"
 
 #include <map>
 #include <string>
 
 #include "base/files/file_path.h"
@@ skipping 18 matching lines @@
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/web_contents.h"
-#include "content/public/test/test_browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-using content::BrowserThread;
 using content::SiteInstance;
 using content::WebContents;
 using extensions::Extension;
 
 namespace {
 
 // Class used to delete a WebContents and TabStripModel when another WebContents
 // is destroyed.
 class DeleteWebContentsOnDestroyedObserver
     : public content::NotificationObserver {
@@ skipping 57 matching lines @@
   int id() { return id_; }
 
  private:
   int id_;
 };
 
 }  // namespace
 
 class TabStripModelTest : public ChromeRenderViewHostTestHarness {
  public:
-  TabStripModelTest() : browser_thread_(BrowserThread::UI, &message_loop_) {
-  }
-
   WebContents* CreateWebContents() {
     return WebContents::Create(WebContents::CreateParams(profile()));
   }
 
   WebContents* CreateWebContentsWithSharedRPH(WebContents* web_contents) {
     WebContents::CreateParams create_params(
         profile(), web_contents->GetRenderViewHost()->GetSiteInstance());
     WebContents* retval = WebContents::Create(create_params);
     EXPECT_EQ(retval->GetRenderProcessHost(),
               web_contents->GetRenderProcessHost());
@@ skipping 66 matching lines @@
     std::vector<std::string> selection;
     base::SplitStringAlongWhitespace(selected_tabs, &selection);
     for (size_t i = 0; i < selection.size(); ++i) {
       int value;
       ASSERT_TRUE(base::StringToInt(selection[i], &value));
       selection_model.AddIndexToSelection(value);
     }
     selection_model.set_active(selection_model.selected_indices()[0]);
     model->SetSelectionFromModel(selection_model);
   }
-
- private:
-  content::TestBrowserThread browser_thread_;
 };
 
 class MockTabStripModelObserver : public TabStripModelObserver {
  public:
   explicit MockTabStripModelObserver(TabStripModel* model)
       : empty_(true),
         deleted_(false),
         model_(model) {}
   virtual ~MockTabStripModelObserver() {}
 
@@ skipping 2145 matching lines @@
   strip.ActivateTabAt(1, true);
   ASSERT_EQ(1, observer.GetStateCount());
   State s(contents2, 1, MockTabStripModelObserver::SELECT);
   s.src_contents = contents2;
   s.src_index = 1;
   s.change_reason = TabStripModelObserver::CHANGE_REASON_NONE;
   EXPECT_TRUE(observer.StateEquals(0, s));
   strip.RemoveObserver(&observer);
   strip.CloseAllTabs();
 }