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 0789e66dd1812b87d2f6ad582b69bc42342ce3a3..c7f282556d3f3248bd132f93cb06785707808cb8 100644
--- a/chrome/browser/sessions/session_restore_browsertest.cc
+++ b/chrome/browser/sessions/session_restore_browsertest.cc
@@ -826,19 +826,33 @@ IN_PROC_BROWSER_TEST_F(SessionRestoreTest, RestorePinnedSelectedTab) {
 
 IN_PROC_BROWSER_TEST_F(SessionRestoreTest, SessionStorage) {
   ui_test_utils::NavigateToURL(browser(), url1_);
-  content::NavigationController* controller =
-      &chrome::GetActiveWebContents(browser())->GetController();
-  ASSERT_TRUE(controller->GetDefaultSessionStorageNamespace());
-  std::string session_storage_persistent_id =
-      controller->GetDefaultSessionStorageNamespace()->persistent_id();
+  const content::NavigationController& controller =
+      chrome::GetActiveWebContents(browser())->GetController();
+  const content::SessionStorageNamespaceMap& session_storage_namspace_map =
+      controller.GetSessionStorageNamespaceMap();
+  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());
-  content::NavigationController* new_controller =
-      &chrome::GetActiveWebContents(new_browser)->GetController();
-  ASSERT_TRUE(new_controller->GetDefaultSessionStorageNamespace());
-  std::string restored_session_storage_persistent_id =
-      new_controller->GetDefaultSessionStorageNamespace()->persistent_id();
-  EXPECT_EQ(session_storage_persistent_id,
-            restored_session_storage_persistent_id);
+
+  const content::NavigationController& new_controller =
+      chrome::GetActiveWebContents(new_browser)->GetController();
+
+  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 << "--";
+  }
 }