Changes session restore callback to always happen when tabs are created

chrome/browser/sessions/session_restore_browsertest.cc

Index: chrome/browser/sessions/session_restore_browsertest.cc
diff --git a/chrome/browser/sessions/session_restore_browsertest.cc b/chrome/browser/sessions/session_restore_browsertest.cc
index 1800ab166ddb46aa1f6d646f75a7e070fb87aa3e..5d39701b02871866082924e515f05db3cd8282d2 100644
--- a/chrome/browser/sessions/session_restore_browsertest.cc
+++ b/chrome/browser/sessions/session_restore_browsertest.cc
@@ -156,6 +156,10 @@ class SessionRestoreTest : public InProcessBrowserTest {
           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;
@@ -192,6 +196,15 @@ class SessionRestoreTest : public InProcessBrowserTest {
     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_;