Make session restore understand that tabs have multiple SessionStorageNamespaces.

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 f6eceaf0a2a899be42c00bd7a574a891aff4f56b..37411ea2005e6d6e8f907eb2cc899de39c91f37c 100644
--- a/chrome/browser/sessions/session_restore_browsertest.cc
+++ b/chrome/browser/sessions/session_restore_browsertest.cc
@@ -773,19 +773,32 @@ IN_PROC_BROWSER_TEST_F(SessionRestoreTest, SessionStorage) {
   ui_test_utils::NavigateToURL(browser(), url1_);
   const content::NavigationController& controller =
       chrome::GetActiveWebContents(browser())->GetController();
-  ASSERT_TRUE(controller.GetSessionStorageNamespaceMap().find("")->second);
-  std::string session_storage_persistent_id =
-      controller.GetSessionStorageNamespaceMap().find("")
-          ->second->persistent_id();
+  const content::SessionStorageNamespaceMap& session_storage_namspace_map =
+      controller.GetSessionStorageNamespaceMap();

[Charlie Reis, 2012/08/06 23:28:11]

There will only be one in here, right?  I guess that's ok, since we test the
multiple namespace case in isolated_apps_browsertest.cc.

[awong, 2012/08/07 00:38:48]

Yes...I elected to do the integration-style test coverage in the
isolated_apps_browsertest because otherwise I'd have to pull in extension
loading code into this test.

+  ASSERT_TRUE(!session_storage_namspace_map.empty());
+  std::map<std::string, std::string> expected_persistent_ids;
+  for (content::SessionStorageNamespaceMap::const_iterator it =
+           session_storage_namspace_map.begin();
+       it != session_storage_namspace_map.end();
+       ++it) {
+    expected_persistent_ids[it->first] = it->second->persistent_id();
+  }
+
   Browser* new_browser = QuitBrowserAndRestore(browser(), 1);
   ASSERT_EQ(1u, BrowserList::size());
   ASSERT_EQ(url1_, chrome::GetActiveWebContents(new_browser)->GetURL());
+
   const content::NavigationController& new_controller =
       chrome::GetActiveWebContents(new_browser)->GetController();
-  ASSERT_TRUE(new_controller.GetSessionStorageNamespaceMap().find("")->second);
-  std::string restored_session_storage_persistent_id =
-      new_controller.GetSessionStorageNamespaceMap().find("")
-          ->second->persistent_id();
-  EXPECT_EQ(session_storage_persistent_id,
-            restored_session_storage_persistent_id);
+
+  const content::SessionStorageNamespaceMap& restored_storage_namespace_map =
+      new_controller.GetSessionStorageNamespaceMap();
+  ASSERT_TRUE(!restored_storage_namespace_map.empty());
+  for (content::SessionStorageNamespaceMap::const_iterator it =
+          restored_storage_namespace_map.begin();
+       it != restored_storage_namespace_map.end();
+       ++it) {
+    EXPECT_EQ(expected_persistent_ids[it->first], it->second->persistent_id())
+        << " for storage partition --" << it->first << "--";

[Charlie Reis, 2012/08/06 23:28:11]

Why the dashes?

[awong, 2012/08/07 00:38:48]

Cause the partition id is often the empty string.

+  }
 }