Move SessionStorageNamespace entirely into NavigationController and support StoragePartitions.

chrome/browser/prerender/prerender_contents.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 "chrome/browser/prerender/prerender_contents.h"
 
 #include <algorithm>
 #include <functional>
 #include <utility>
 
@@ skipping 193 matching lines @@
        it != pending_prerenders_.end();
        ++it) {
     if (it->weak_prerender_handle.get() == &prerender_handle)
       return true;
   }
   return false;
 }
 
 void PrerenderContents::StartPendingPrerenders() {
   SessionStorageNamespace* session_storage_namespace = NULL;
-  if (RenderViewHost* render_view_host = GetRenderViewHostMutable())
-    session_storage_namespace = render_view_host->GetSessionStorageNamespace();
+  if (prerender_contents_.get()) {
+    // TODO(ajwong): This does not correctly handle storage for isolated apps.
+    session_storage_namespace =
+        prerender_contents_->web_contents()->GetController()
+            .GetDefaultSessionStorageNamespace();
+  }
   DCHECK(child_id_ == -1 || session_storage_namespace);
 
   std::vector<PendingPrerenderInfo> pending_prerender_list;
   pending_prerender_list.swap(pending_prerenders_);
   for (std::vector<PendingPrerenderInfo>::iterator it =
            pending_prerender_list.begin();
        it != pending_prerender_list.end();
        ++it) {
     if (it->weak_prerender_handle && it->weak_prerender_handle->IsValid()) {
       prerender_manager_->StartPendingPrerender(
@@ skipping 267 matching lines @@
       break;
   }
 }
 
 void PrerenderContents::OnRenderViewHostCreated(
     RenderViewHost* new_render_view_host) {
 }
 
 WebContents* PrerenderContents::CreateWebContents(
     SessionStorageNamespace* session_storage_namespace) {
-  return  WebContents::Create(profile_, NULL, MSG_ROUTING_NONE, NULL,
-                              session_storage_namespace);
+  // TODO(ajwong): Remove the temporary map once prerendering is aware of
+  // multiple session storage namespaces per tab.
+  content::SessionStorageNamespaceMap session_storage_namespace_map;
+  session_storage_namespace_map[""] = session_storage_namespace;
+  return  WebContents::CreateWithSessionStorage(
+      profile_, NULL, MSG_ROUTING_NONE, NULL, session_storage_namespace_map);
 }
 
 void PrerenderContents::OnUpdateFaviconURL(
     int32 page_id,
     const std::vector<FaviconURL>& urls) {
   VLOG(1) << "PrerenderContents::OnUpdateFaviconURL" << icon_url_;
   for (std::vector<FaviconURL>::const_iterator it = urls.begin();
        it != urls.end(); ++it) {
     if (it->icon_type == FaviconURL::FAVICON) {
       icon_url_ = it->icon_url;
@@ skipping 192 matching lines @@
 bool PrerenderContents::IsCrossSiteNavigationPending() const {
   if (!prerender_contents_.get() || !prerender_contents_->web_contents())
     return false;
   const WebContents* web_contents = prerender_contents_->web_contents();
   return (web_contents->GetSiteInstance() !=
           web_contents->GetPendingSiteInstance());
 }
 
 
 }  // namespace prerender