Move SessionStorageNamespace entirely into NavigationController and support StoragePartitions.

chrome/browser/prerender/prerender_manager.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_manager.h"
 
 #include <algorithm>
 #include <functional>
 #include <string>
 #include <vector>
@@ skipping 215 matching lines @@
     }
   }
 
   // Unit tests pass in a process_id == -1.
   SessionStorageNamespace* session_storage_namespace = NULL;
   if (process_id != -1) {
     RenderViewHost* source_render_view_host =
         RenderViewHost::FromID(process_id, route_id);
     if (!source_render_view_host)
       return NULL;
+    WebContents* source_web_contents =
+        WebContents::FromRenderViewHost(source_render_view_host);
+    if (!source_web_contents)
+      return NULL;
+    // TODO(ajwong): This does not correctly handle storage for isolated apps.
     session_storage_namespace =
-        source_render_view_host->GetSessionStorageNamespace();
+        source_web_contents->GetController()
+            .GetDefaultSessionStorageNamespace();
   }
 
   return AddPrerender(ORIGIN_LINK_REL_PRERENDER,
                       process_id, url, referrer, size,
                       session_storage_namespace);
 #endif
 }
 
 PrerenderHandle* PrerenderManager::AddPrerenderFromOmnibox(
     const GURL& url,
@@ skipping 21 matching lines @@
         active_prerender_list_.front()->contents();
     prerender_contents->Destroy(FINAL_STATUS_CANCELLED);
   }
 }
 
 bool PrerenderManager::MaybeUsePrerenderedPage(WebContents* web_contents,
                                                const GURL& url) {
   DCHECK(CalledOnValidThread());
   DCHECK(!IsWebContentsPrerendering(web_contents));
 
-  RenderViewHost* old_render_view_host = web_contents->GetRenderViewHost();
-
   DeleteOldEntries();
   DeletePendingDeleteEntries();
+  // TODO(ajwong): This doesn't handle isolated apps correctly.
   PrerenderData* prerender_data = FindPrerenderData(
-          url, old_render_view_host->GetSessionStorageNamespace());
+          url,
+          web_contents->GetController().GetDefaultSessionStorageNamespace());
   if (!prerender_data)
     return false;
   DCHECK(prerender_data->contents_);
   if (IsNoSwapInExperiment(prerender_data->contents_->experiment_id()))
     return false;
 
   if (TabContents* new_tab_contents =
       prerender_data->contents_->prerender_contents()) {
     if (web_contents == new_tab_contents->web_contents())
       return false;  // Do not swap in to ourself.
@@ skipping 933 matching lines @@
   if (!render_process_host || !render_process_host->GetBrowserContext())
     return NULL;
   Profile* profile = Profile::FromBrowserContext(
       render_process_host->GetBrowserContext());
   if (!profile)
     return NULL;
   return PrerenderManagerFactory::GetInstance()->GetForProfile(profile);
 }
 
 }  // namespace prerender