Add TestBrowserThreadBundle into RenderViewHostTestHarness. Kill some unnecessary real threads.

chrome/browser/ui/toolbar/back_forward_menu_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/toolbar/back_forward_menu_model.h"
 
 #include "base/path_service.h"
 #include "base/string16.h"
 #include "base/string_util.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/favicon/favicon_service_factory.h"
 #include "chrome/browser/history/history_service.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "chrome/test/base/test_browser_window.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/web_contents.h"
-#include "content/public/test/test_browser_thread.h"
 #include "content/public/test/web_contents_tester.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/codec/png_codec.h"
 
-using content::BrowserThread;
 using content::WebContentsTester;
 
 namespace {
 
 // Creates a bitmap of the specified color.
 SkBitmap CreateBitmap(SkColor color) {
   SkBitmap bitmap;
   bitmap.setConfig(SkBitmap::kARGB_8888_Config, 16, 16);
   bitmap.allocPixels();
   bitmap.eraseColor(color);
@@ skipping 14 matching lines @@
  private:
   bool was_called_;
 
   DISALLOW_COPY_AND_ASSIGN(FaviconDelegate);
 };
 
 }  // namespace
 
 class BackFwdMenuModelTest : public ChromeRenderViewHostTestHarness {
  public:
-  BackFwdMenuModelTest()
-      : ui_thread_(BrowserThread::UI, &message_loop_) {
-  }
-
   void ValidateModel(BackForwardMenuModel* model, int history_items,
                      int chapter_stops) {
     int h = std::min(BackForwardMenuModel::kMaxHistoryItems, history_items);
     int c = std::min(BackForwardMenuModel::kMaxChapterStops, chapter_stops);
     EXPECT_EQ(h, model->GetHistoryItemCount());
     EXPECT_EQ(c, model->GetChapterStopCount(h));
     if (h > 0)
       h += 2;  // Separator and View History link.
     if (c > 0)
       ++c;
@@ skipping 20 matching lines @@
 
   // Goes back/forward and commits the load.
   void GoBack() {
     controller().GoBack();
     WebContentsTester::For(web_contents())->CommitPendingNavigation();
   }
   void GoForward() {
     controller().GoForward();
     WebContentsTester::For(web_contents())->CommitPendingNavigation();
   }
-
-  content::TestBrowserThread ui_thread_;
 };
 
 TEST_F(BackFwdMenuModelTest, BasicCase) {
   scoped_ptr<BackForwardMenuModel> back_model(new BackForwardMenuModel(
       NULL, BackForwardMenuModel::BACKWARD_MENU));
   back_model->set_test_web_contents(web_contents());
 
   scoped_ptr<BackForwardMenuModel> forward_model(new BackForwardMenuModel(
       NULL, BackForwardMenuModel::FORWARD_MENU));
   forward_model->set_test_web_contents(web_contents());
@@ skipping 444 matching lines @@
   // Verify we did get the expected favicon.
   EXPECT_EQ(0, memcmp(new_icon_bitmap.getPixels(),
                       valid_icon_bitmap.getPixels(),
                       new_icon_bitmap.getSize()));
 
   // Make sure the browser deconstructor doesn't have problems.
   browser->tab_strip_model()->CloseAllTabs();
   // This is required to prevent the message loop from hanging.
   profile()->DestroyHistoryService();
 }