Move SessionStorageNamespace entirely into NavigationController and support StoragePartitions.

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 9155f8237a6b875cdf2678f80e3ff7ed71aa1c4a..8a1e198b740b29281f677a130e904b4cb5d1fe2d 100644
--- a/chrome/browser/sessions/session_restore_browsertest.cc
+++ b/chrome/browser/sessions/session_restore_browsertest.cc
@@ -774,19 +774,19 @@ IN_PROC_BROWSER_TEST_F(SessionRestoreTest, RestorePinnedSelectedTab) {
 
 IN_PROC_BROWSER_TEST_F(SessionRestoreTest, SessionStorage) {
   ui_test_utils::NavigateToURL(browser(), url1_);
-  const content::NavigationController& controller =
-      chrome::GetActiveWebContents(browser())->GetController();
-  ASSERT_TRUE(controller.GetSessionStorageNamespace());
+  content::NavigationController* controller =
+      &chrome::GetActiveWebContents(browser())->GetController();
+  ASSERT_TRUE(controller->GetDefaultSessionStorageNamespace());
   std::string session_storage_persistent_id =
-      controller.GetSessionStorageNamespace()->persistent_id();
+      controller->GetDefaultSessionStorageNamespace()->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.GetSessionStorageNamespace());
+  content::NavigationController* new_controller =
+      &chrome::GetActiveWebContents(new_browser)->GetController();
+  ASSERT_TRUE(new_controller->GetDefaultSessionStorageNamespace());
   std::string restored_session_storage_persistent_id =
-      new_controller.GetSessionStorageNamespace()->persistent_id();
+      new_controller->GetDefaultSessionStorageNamespace()->persistent_id();
   EXPECT_EQ(session_storage_persistent_id,
             restored_session_storage_persistent_id);
 }