Move SessionStorageNamespace entirely into NavigationController and support StoragePartitions.

chrome/browser/sessions/session_restore_browsertest.cc

 // Copyright (c) 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 "base/command_line.h"
 #include "base/file_path.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/defaults.h"
 #include "chrome/browser/first_run/first_run.h"
@@ skipping 756 matching lines @@
 
   // The pinned tab is the selected tab.
   ASSERT_EQ(2, new_browser->tab_count());
   EXPECT_EQ(0, new_browser->active_index());
   EXPECT_EQ(url1_, chrome::GetActiveWebContents(new_browser)->GetURL());
   EXPECT_EQ(url2_, chrome::GetWebContentsAt(new_browser, 1)->GetURL());
 }
 
 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);
 }