Add TestBrowserThreadBundle into RenderViewHostTestHarness. Kill some unnecessary real threads.

chrome/browser/captive_portal/captive_portal_tab_reloader_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/captive_portal/captive_portal_tab_reloader.h"
 
 #include "base/callback.h"
 #include "base/message_loop.h"
 #include "chrome/browser/captive_portal/captive_portal_service.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/interstitial_page.h"
 #include "content/public/browser/interstitial_page_delegate.h"
 #include "content/public/browser/web_contents.h"
-#include "content/public/test/test_browser_thread.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/net_errors.h"
 #include "net/cert/cert_status_flags.h"
 #include "net/ssl/ssl_info.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace captive_portal {
 
 // Used for testing CaptivePortalTabReloader in isolation from the observer.
@@ skipping 56 matching lines @@
   // InterstitialPageDelegate implementation:
   virtual std::string GetHTMLContents() OVERRIDE {
     return "HTML Contents";
   }
 
   DISALLOW_COPY_AND_ASSIGN(MockInterstitialPageDelegate);
 };
 
 class CaptivePortalTabReloaderTest : public ChromeRenderViewHostTestHarness {
  public:
-  CaptivePortalTabReloaderTest()
-      : ui_thread_(content::BrowserThread::UI, &message_loop_),
-        file_user_blocking_thread_(content::BrowserThread::FILE_USER_BLOCKING,
-                                   &message_loop_),
-        io_thread_(content::BrowserThread::IO, &message_loop_) {
-  }
-
-  virtual ~CaptivePortalTabReloaderTest() {
-  }
-
   // testing::Test:
   virtual void SetUp() OVERRIDE {
     ChromeRenderViewHostTestHarness::SetUp();
     tab_reloader_.reset(new testing::StrictMock<TestCaptivePortalTabReloader>(
         web_contents()));
 
     // Most tests don't run the message loop, so don't use a timer for them.
     tab_reloader_->set_slow_ssl_load_time(base::TimeDelta());
   }
 
   virtual void TearDown() OVERRIDE {
     EXPECT_FALSE(tab_reloader().TimerRunning());
     tab_reloader_.reset(NULL);
     ChromeRenderViewHostTestHarness::TearDown();
   }
 
   TestCaptivePortalTabReloader& tab_reloader() { return *tab_reloader_.get(); }
 
  private:
-  content::TestBrowserThread ui_thread_;
-  content::TestBrowserThread file_user_blocking_thread_;
-  content::TestBrowserThread io_thread_;
-
   scoped_ptr<TestCaptivePortalTabReloader> tab_reloader_;
 };
 
 // Simulates a slow SSL load when the Internet is connected.
 TEST_F(CaptivePortalTabReloaderTest, InternetConnected) {
   EXPECT_EQ(CaptivePortalTabReloader::STATE_NONE, tab_reloader().state());
 
   tab_reloader().OnLoadStart(true);
   EXPECT_EQ(CaptivePortalTabReloader::STATE_TIMER_RUNNING,
             tab_reloader().state());
@@ skipping 555 matching lines @@
   // There should be no captive portal check pending after the redirect.
   base::MessageLoop::current()->RunUntilIdle();
 
   // Logging in shouldn't do anything.
   tab_reloader().OnCaptivePortalResults(RESULT_BEHIND_CAPTIVE_PORTAL,
                                         RESULT_INTERNET_CONNECTED);
   EXPECT_EQ(CaptivePortalTabReloader::STATE_NONE, tab_reloader().state());
 }
 
 }  // namespace captive_portal