Changes session restore callback to always happen when tabs are created

chrome/browser/sessions/session_restore_browsertest.cc

 // Copyright 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 <vector>
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/memory/memory_pressure_listener.h"
 #include "base/process/launch.h"
@@ skipping 138 matching lines @@
                                     ui::PAGE_TRANSITION_LINK);
       chrome::Navigate(&params);
     }
     Browser* new_browser = window_observer.WaitForSingleNewBrowser();
     // Stop loading anything more if we are running out of space.
     if (!no_memory_pressure) {
       base::MemoryPressureListener::NotifyMemoryPressure(
           base::MemoryPressureListener::MEMORY_PRESSURE_LEVEL_CRITICAL);
     }
     restore_observer.Wait();
+
+    if (no_memory_pressure)

[Simon Que, 2015/03/19 18:56:48]

Can you explain what you're doing here? I'm not familiar with it.

[sky, 2015/03/19 19:15:32]

This is necessitated by the change in behavior. These tests all trigger the
async case, which previously meant the notification was sent after all the tabs
loaded. The WaitForTabsToLoad, as the name implies, waits for all the tabs to
load which simulates what was happening before. The one case that doesn't want
the wait is if no_memory_pressure is true. That's because TabLoader effectively
stops when it sees memory pressure.

+      WaitForTabsToLoad(new_browser);
+
     g_browser_process->ReleaseModule();
 
     return new_browser;
   }
 
   void GoBack(Browser* browser) {
     content::TestNavigationObserver observer(
         browser->tab_strip_model()->GetActiveWebContents());
     chrome::GoBack(browser, CURRENT_TAB);
     observer.Wait();
@@ skipping 16 matching lines @@
         content::RenderProcessHost::AllHostsIterator();
     int count = 0;
     while (!hosts.IsAtEnd()) {
       if (hosts.GetCurrentValue()->HasConnection())
         count++;
       hosts.Advance();
     }
     return count;
   }
 
+  void WaitForTabsToLoad(Browser* browser) {
+    for (int i = 0; i < browser->tab_strip_model()->count(); ++i) {
+      content::WebContents* contents =
+          browser->tab_strip_model()->GetWebContentsAt(i);
+      contents->GetController().LoadIfNecessary();
+      content::WaitForLoadStop(contents);
+    }
+  }
+
   GURL url1_;
   GURL url2_;
   GURL url3_;
 
   const BrowserList* active_browser_list_;
 };
 
 // Verifies that restored tabs have a root window. This is important
 // otherwise the wrong information is communicated to the renderer.
 // (http://crbug.com/342672).
@@ skipping 1055 matching lines @@
   content::NavigationController* controller =
       &browser()->tab_strip_model()->GetActiveWebContents()->GetController();
   EXPECT_TRUE(
       controller->GetDefaultSessionStorageNamespace()->should_persist());
 
   // Quit and restore. Check that no extra tabs were created.
   Browser* new_browser = QuitBrowserAndRestore(browser(), 1);
   ASSERT_EQ(1u, active_browser_list_->size());
   EXPECT_EQ(1, new_browser->tab_strip_model()->count());
 }