Fix SessionStorage confusion between RenderViewHostImpl and NavigationController.

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 305 matching lines @@
     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;
     if (source_web_contents->GetURL().host() == url.host())
       origin = ORIGIN_LINK_REL_PRERENDER_SAMEDOMAIN;
-    // TODO(ajwong): This does not correctly handle storage for isolated apps.
     session_storage_namespace =
-        source_web_contents->GetController()
-            .GetDefaultSessionStorageNamespace();
+        source_web_contents->GetController().GetSessionStorageNamespace();
   }
 
   // If the prerender request comes from a recently cancelled prerender that
   // |this| still owns, then abort the prerender.
   for (ScopedVector<PrerenderData>::iterator it = to_delete_prerenders_.begin();
        it != to_delete_prerenders_.end(); ++it) {
     PrerenderContents* prerender_contents = (*it)->contents();
     int contents_child_id;
     int contents_route_id;
     if (prerender_contents->GetChildId(&contents_child_id) &&
@@ skipping 61 matching lines @@
   }
 }
 
 bool PrerenderManager::MaybeUsePrerenderedPage(WebContents* web_contents,
                                                const GURL& url) {
   DCHECK(CalledOnValidThread());
   DCHECK(!IsWebContentsPrerendering(web_contents, NULL));
 
   DeleteOldEntries();
   to_delete_prerenders_.clear();
-  // TODO(ajwong): This doesn't handle isolated apps correctly.
   PrerenderData* prerender_data = FindPrerenderData(
-          url,
-          web_contents->GetController().GetDefaultSessionStorageNamespace());
+      url, web_contents->GetController().GetSessionStorageNamespace());
   if (!prerender_data)
     return false;
   DCHECK(prerender_data->contents());
   if (IsNoSwapInExperiment(prerender_data->contents()->experiment_id()))
     return false;
 
   if (WebContents* new_web_contents =
       prerender_data->contents()->prerender_contents()) {
     if (web_contents == new_web_contents)
       return false;  // Do not swap in to ourself.
@@ skipping 1108 matching lines @@
     logged_in_state_->erase(domain_key);
 }
 
 void PrerenderManager::LoggedInPredictorDataReceived(
     scoped_ptr<LoggedInStateMap> new_map) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   logged_in_state_.swap(new_map);
 }
 
 }  // namespace prerender