Add TestBrowserThreadBundle into RenderViewHostTestHarness. Kill some unnecessary real threads.

chrome/browser/sessions/persistent_tab_restore_service_browsertest.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/sessions/persistent_tab_restore_service.h"
 
 #include "base/compiler_specific.h"
+#include "base/run_loop.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sessions/session_service.h"
 #include "chrome/browser/sessions/session_service_factory.h"
 #include "chrome/browser/sessions/session_types.h"
 #include "chrome/browser/sessions/tab_restore_service_factory.h"
 #include "chrome/browser/sessions/tab_restore_service_observer.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "chrome/test/base/chrome_render_view_test.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/sessions/serialized_navigation_entry_test_helper.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/render_view_test.h"
-#include "content/public/test/test_browser_thread.h"
 #include "content/public/test/test_utils.h"
 #include "content/public/test/web_contents_tester.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h"
 
 typedef TabRestoreService::Tab Tab;
 typedef TabRestoreService::Window Window;
 
 using content::NavigationEntry;
 using content::WebContentsTester;
@@ skipping 12 matching lines @@
     return time_;
   }
 
  private:
   base::Time time_;
 };
 
 class PersistentTabRestoreServiceTest : public ChromeRenderViewHostTestHarness {
  public:
   PersistentTabRestoreServiceTest()
-      : ui_thread_(content::BrowserThread::UI, &message_loop_) {
-    url1_ = GURL("http://1");
-    url2_ = GURL("http://2");
-    url3_ = GURL("http://3");
-    user_agent_override_ = "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/535.19"
-        " (KHTML, like Gecko) Chrome/18.0.1025.45 Safari/535.19";
+    : url1_("http://1"),
+      url2_("http://2"),
+      url3_("http://3"),
+      user_agent_override_(
+          "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/535.19"
+          " (KHTML, like Gecko) Chrome/18.0.1025.45 Safari/535.19") {
   }
 
   virtual ~PersistentTabRestoreServiceTest() {
   }
 
  protected:
   enum {
     kMaxEntries = TabRestoreServiceHelper::kMaxEntries,
   };
 
@@ skipping 34 matching lines @@
     controller().GoToIndex(index);
     WebContentsTester::For(web_contents())->CommitPendingNavigation();
   }
 
   void RecreateService() {
     // Must set service to null first so that it is destroyed before the new
     // one is created.
     service_->Shutdown();
     service_.reset();
     service_.reset(new PersistentTabRestoreService(profile(), time_factory_));
-    service_->LoadTabsFromLastSession();
+    SynchronousLoadTabsFromLastSession();
   }
 
   // Adds a window with one tab and url to the profile's session service.
   // If |pinned| is true, the tab is marked as pinned in the session service.
   void AddWindowWithOneTabToSessionService(bool pinned) {
     SessionService* session_service =
         SessionServiceFactory::GetForProfile(profile());
     SessionID tab_id;
     SessionID window_id;
     session_service->SetWindowType(
@@ skipping 17 matching lines @@
     // The profile takes ownership of this.
     SessionService* session_service = new SessionService(profile());
     SessionServiceFactory::SetForTestProfile(profile(), session_service);
 
     AddWindowWithOneTabToSessionService(pinned);
 
     // Set this, otherwise previous session won't be loaded.
     profile()->set_last_session_exited_cleanly(false);
   }
 
+  void SynchronousLoadTabsFromLastSession() {
+    // Ensures that the load is complete before continuing.
+    service_->LoadTabsFromLastSession();
+    base::RunLoop().RunUntilIdle();
+  }
+
   GURL url1_;
   GURL url2_;
   GURL url3_;
   std::string user_agent_override_;
   scoped_ptr<PersistentTabRestoreService> service_;
   PersistentTabRestoreTimeFactory* time_factory_;
   content::RenderViewTest::RendererWebKitPlatformSupportImplNoSandbox
       webkit_platform_support_;
-  content::TestBrowserThread ui_thread_;
 };
 
 namespace {
 
 class TestTabRestoreServiceObserver : public TabRestoreServiceObserver {
  public:
   TestTabRestoreServiceObserver() : got_loaded_(false) {}
 
   void clear_got_loaded() { got_loaded_ = false; }
   bool got_loaded() const { return got_loaded_; }
@@ skipping 199 matching lines @@
 TEST_F(PersistentTabRestoreServiceTest, DontLoadTwice) {
   AddThreeNavigations();
 
   // Have the service record the tab.
   service_->CreateHistoricalTab(web_contents(), -1);
   ASSERT_EQ(1U, service_->entries().size());
 
   // Recreate the service and have it load the tabs.
   RecreateService();
 
-  service_->LoadTabsFromLastSession();
+  SynchronousLoadTabsFromLastSession();
 
   // There should only be one entry.
   ASSERT_EQ(1U, service_->entries().size());
 }
 
 // Makes sure we load the previous session as necessary.
 TEST_F(PersistentTabRestoreServiceTest, LoadPreviousSession) {
   CreateSessionServiceWithOneWindow(false);
 
   SessionServiceFactory::GetForProfile(profile())->
       MoveCurrentSessionToLastSession();
 
   EXPECT_FALSE(service_->IsLoaded());
 
   TestTabRestoreServiceObserver observer;
   service_->AddObserver(&observer);
-  service_->LoadTabsFromLastSession();
+  SynchronousLoadTabsFromLastSession();
   EXPECT_TRUE(observer.got_loaded());
   service_->RemoveObserver(&observer);
 
   // Make sure we get back one entry with one tab whose url is url1.
   ASSERT_EQ(1U, service_->entries().size());
   TabRestoreService::Entry* entry2 = service_->entries().front();
   ASSERT_EQ(TabRestoreService::WINDOW, entry2->type);
   TabRestoreService::Window* window =
       static_cast<TabRestoreService::Window*>(entry2);
   ASSERT_EQ(1U, window->tabs.size());
   EXPECT_EQ(0, window->timestamp.ToInternalValue());
   EXPECT_EQ(0, window->selected_tab_index);
   ASSERT_EQ(1U, window->tabs[0].navigations.size());
   EXPECT_EQ(0, window->tabs[0].current_navigation_index);
   EXPECT_EQ(0, window->tabs[0].timestamp.ToInternalValue());
   EXPECT_TRUE(url1_ == window->tabs[0].navigations[0].virtual_url());
 }
 
 // Makes sure we don't attempt to load previous sessions after a restore.
 TEST_F(PersistentTabRestoreServiceTest, DontLoadAfterRestore) {
   CreateSessionServiceWithOneWindow(false);
 
   SessionServiceFactory::GetForProfile(profile())->
       MoveCurrentSessionToLastSession();
 
   profile()->set_restored_last_session(true);
 
-  service_->LoadTabsFromLastSession();
+  SynchronousLoadTabsFromLastSession();
 
   // Because we restored a session PersistentTabRestoreService shouldn't load
   // the tabs.
   ASSERT_EQ(0U, service_->entries().size());
 }
 
 // Makes sure we don't attempt to load previous sessions after a clean exit.
 TEST_F(PersistentTabRestoreServiceTest, DontLoadAfterCleanExit) {
   CreateSessionServiceWithOneWindow(false);
 
   SessionServiceFactory::GetForProfile(profile())->
       MoveCurrentSessionToLastSession();
 
   profile()->set_last_session_exited_cleanly(true);
 
-  service_->LoadTabsFromLastSession();
+  SynchronousLoadTabsFromLastSession();
 
   ASSERT_EQ(0U, service_->entries().size());
 }
 
 TEST_F(PersistentTabRestoreServiceTest, LoadPreviousSessionAndTabs) {
   CreateSessionServiceWithOneWindow(false);
 
   SessionServiceFactory::GetForProfile(profile())->
       MoveCurrentSessionToLastSession();
 
@@ skipping 257 matching lines @@
 
   const size_t max_entries = kMaxEntries;
   for (size_t i = 0; i < max_entries + 5; i++) {
     NavigateAndCommit(
         GURL(base::StringPrintf("http://%d", static_cast<int>(i))));
     service_->CreateHistoricalTab(web_contents(), -1);
   }
 
   EXPECT_EQ(max_entries, service_->entries().size());
   // This should not crash.
-  service_->LoadTabsFromLastSession();
+  SynchronousLoadTabsFromLastSession();
   EXPECT_EQ(max_entries, service_->entries().size());
 }
 
 // Makes sure invoking LoadTabsFromLastSession() when the max number of entries
 // have been added results in IsLoaded() returning true and notifies observers.
 TEST_F(PersistentTabRestoreServiceTest, GoToLoadedWhenHaveMaxEntries) {
   const size_t max_entries = kMaxEntries;
   for (size_t i = 0; i < max_entries + 5; i++) {
     NavigateAndCommit(
         GURL(base::StringPrintf("http://%d", static_cast<int>(i))));
     service_->CreateHistoricalTab(web_contents(), -1);
   }
 
   EXPECT_FALSE(service_->IsLoaded());
   TestTabRestoreServiceObserver observer;
   service_->AddObserver(&observer);
   EXPECT_EQ(max_entries, service_->entries().size());
-  service_->LoadTabsFromLastSession();
+  SynchronousLoadTabsFromLastSession();
   EXPECT_TRUE(observer.got_loaded());
   EXPECT_TRUE(service_->IsLoaded());
   service_->RemoveObserver(&observer);
 }