Add TestBrowserThreadBundle into RenderViewHostTestHarness. Kill some unnecessary real threads.

chrome/browser/chromeos/login/merge_session_load_page_unittest.cc

 // Copyright (c) 2013 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 "base/run_loop.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/login/merge_session_load_page.h"
 #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"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "content/public/browser/interstitial_page.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/web_contents.h"
-#include "content/public/test/test_browser_thread.h"
 #include "content/public/test/web_contents_tester.h"
 
 using content::BrowserThread;
 using content::InterstitialPage;
 using content::WebContents;
 using content::WebContentsTester;
 
 namespace {
 
 const char kURL1[] = "http://www.google.com/";
@@ skipping 16 matching lines @@
     interstitial_page_->DontCreateViewForTesting();
   }
 
  private:
   MergeSessionLoadPageTest* test_page_;
 
   DISALLOW_COPY_AND_ASSIGN(TestMergeSessionLoadPage);
 };
 
 class MergeSessionLoadPageTest : public ChromeRenderViewHostTestHarness {
- public:
-  MergeSessionLoadPageTest()
-      : ui_thread_(BrowserThread::UI, base::MessageLoop::current()),
-        file_user_blocking_thread_(
-            BrowserThread::FILE_USER_BLOCKING, base::MessageLoop::current()),
-        io_thread_(BrowserThread::IO, base::MessageLoop::current()) {
+ protected:
+  virtual void SetUp() OVERRIDE {
+    ChromeRenderViewHostTestHarness::SetUp();
+#if defined OS_CHROMEOS
+  test_user_manager_.reset(new chromeos::ScopedTestUserManager());
+#endif
+  }
+
+  virtual void TearDown() OVERRIDE {
+#if defined OS_CHROMEOS
+    // Clean up pending tasks that might depend on the user manager.
+    base::RunLoop().RunUntilIdle();
+    test_user_manager_.reset();
+#endif
+    ChromeRenderViewHostTestHarness::TearDown();
   }
 
   void Navigate(const char* url, int page_id) {
     WebContentsTester::For(web_contents())->TestDidNavigate(
         web_contents()->GetRenderViewHost(), page_id, GURL(url),
         content::PAGE_TRANSITION_TYPED);
   }
 
   void ShowInterstitial(const char* url) {
     (new TestMergeSessionLoadPage(web_contents(), GURL(url), this))->Show();
   }
 
   // Returns the MergeSessionLoadPage currently showing or NULL if none is
   // showing.
   InterstitialPage* GetMergeSessionLoadPage() {
     return InterstitialPage::GetInterstitialPage(web_contents());
   }
 
  private:
-  content::TestBrowserThread ui_thread_;
-  content::TestBrowserThread file_user_blocking_thread_;
-  content::TestBrowserThread io_thread_;
-
   ScopedStubCrosEnabler stub_cros_enabler_;
   ScopedTestDeviceSettingsService test_device_settings_service_;
   ScopedTestCrosSettings test_cros_settings_;
-  ScopedTestUserManager test_user_manager_;
-
-  DISALLOW_COPY_AND_ASSIGN(MergeSessionLoadPageTest);
+  scoped_ptr<chromeos::ScopedTestUserManager> test_user_manager_;
 };
 
 TEST_F(MergeSessionLoadPageTest, MergeSessionPageNotShown) {
   UserManager::Get()->SetMergeSessionState(
       UserManager::MERGE_STATUS_DONE);
   // Start a load.
   Navigate(kURL1, 1);
   // Load next page.
   controller().LoadURL(GURL(kURL2), content::Referrer(),
                        content::PAGE_TRANSITION_TYPED, std::string());
@@ skipping 11 matching lines @@
   Navigate(kURL1, 1);
   // Load next page.
   controller().LoadURL(GURL(kURL2), content::Referrer(),
                        content::PAGE_TRANSITION_TYPED, std::string());
 
   // Simulate the load causing an merge session interstitial page
   // to be shown.
   ShowInterstitial(kURL2);
   InterstitialPage* interstitial = GetMergeSessionLoadPage();
   ASSERT_TRUE(interstitial);
-  base::MessageLoop::current()->RunUntilIdle();
+  base::RunLoop().RunUntilIdle();
 
   // Simulate merge session completion.
   UserManager::Get()->SetMergeSessionState(
       UserManager::MERGE_STATUS_DONE);
-  base::MessageLoop::current()->RunUntilIdle();
+  base::RunLoop().RunUntilIdle();
 
   // The URL remains to be URL2.
   EXPECT_EQ(kURL2, web_contents()->GetURL().spec());
 
   // Commit navigation and the interstitial page is gone.
   Navigate(kURL2, 2);
   EXPECT_FALSE(GetMergeSessionLoadPage());
 }
 
 }  // namespace chromeos