Use TabLoader in TabRestoreService.

chrome/browser/ui/browser_tabrestore_browsertest.cc

 // Copyright 2014 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/chrome_notification_types.h"
 #include "chrome/browser/sessions/tab_restore_service_factory.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_live_tab_context.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/interactive_test_utils.h"
 #include "components/sessions/core/tab_restore_service.h"
+#include "content/public/browser/notification_service.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/url_constants.h"
 #include "content/public/test/browser_test_utils.h"
 
 typedef InProcessBrowserTest BrowserTabRestoreTest;
 
 void AwaitTabsReady(content::DOMMessageQueue* message_queue, int tabs) {
   for (int i = 0; i < tabs; ++i) {
     std::string message;
     EXPECT_TRUE(message_queue->WaitForMessage(&message));
@@ skipping 57 matching lines @@
   Browser* browser = active_browser_list->get(0);
   RecentTabsSubMenuModel menu(NULL, browser, NULL);
   menu.ExecuteCommand(
       RecentTabsSubMenuModel::GetFirstRecentTabsCommandId(), 0);
   AwaitTabsReady(&queue, 2);
 
   // There should be 3 restored tabs in the new browser.
   EXPECT_EQ(2u, active_browser_list->size());
   browser = active_browser_list->get(1);
   EXPECT_EQ(3, browser->tab_strip_model()->count());
+  // For the two test tabs we've just received "READY" DOM message.
+  // But there won't be such message from the "about:blank" tab.
+  // And it is possible that TabLoader hasn't loaded it yet.
+  // Thus we should wait for "load stop" event before we will perform
+  // CheckVisbility on "about:blank".
+  {
+    const content::WebContents* about_blank_contents =
+        browser->tab_strip_model()->GetWebContentsAt(0);
+    EXPECT_EQ("about:blank", about_blank_contents->GetURL().spec());
+    if (about_blank_contents->IsLoading() ||
+        about_blank_contents->GetController().NeedsReload()) {
+      content::WindowedNotificationObserver load_stop_observer(
+          content::NOTIFICATION_LOAD_STOP,
+          content::Source<content::NavigationController>(
+              &about_blank_contents->GetController()));
+      load_stop_observer.Wait();
+    }
+  }
 
   // The middle tab only should have visible disposition.
   CheckVisbility(browser->tab_strip_model(), 1);
 }
 
 IN_PROC_BROWSER_TEST_F(BrowserTabRestoreTest, DelegateRestoreTabDisposition) {
   // Create tabs.
   CreateTestTabs(browser());
   EXPECT_EQ(3, browser()->tab_strip_model()->count());
 
@@ skipping 22 matching lines @@
 
   // Restore tabs using that delegated restore service.
   content::DOMMessageQueue queue;
   service->RestoreMostRecentEntry(context);
   AwaitTabsReady(&queue, 2);
 
   // There should be 3 restored tabs in the new browser.
   EXPECT_EQ(2u, active_browser_list->size());
   browser = active_browser_list->get(1);
   EXPECT_EQ(3, browser->tab_strip_model()->count());
+  // The same as in RecentTabsMenuTabDisposition test case.
+  // See there for the explanation.
+  {
+    const content::WebContents* about_blank_contents =
+        browser->tab_strip_model()->GetWebContentsAt(0);
+    EXPECT_EQ("about:blank", about_blank_contents->GetURL().spec());
+    if (about_blank_contents->IsLoading() ||
+        about_blank_contents->GetController().NeedsReload()) {
+      content::WindowedNotificationObserver load_stop_observer(
+          content::NOTIFICATION_LOAD_STOP,
+          content::Source<content::NavigationController>(
+              &about_blank_contents->GetController()));
+      load_stop_observer.Wait();
+    }
+  }
 
   // The middle tab only should have visible disposition.
   CheckVisbility(browser->tab_strip_model(), 1);
 }