Fix SessionStorage confusion between RenderViewHostImpl and NavigationController.

content/browser/web_contents/interstitial_page_impl.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 "content/browser/web_contents/interstitial_page_impl.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
@@ skipping 475 matching lines @@
     return NULL;
 
   // Interstitial pages don't want to share the session storage so we mint a
   // new one.
   BrowserContext* browser_context = web_contents()->GetBrowserContext();
   scoped_refptr<SiteInstance> site_instance =
       SiteInstance::Create(browser_context);
   DOMStorageContextImpl* dom_storage_context =
       static_cast<DOMStorageContextImpl*>(BrowserContext::GetStoragePartition(
           browser_context, site_instance.get())->GetDOMStorageContext());
-  SessionStorageNamespaceImpl* session_storage_namespace_impl =
+  session_storage_namespace_ =
       new SessionStorageNamespaceImpl(dom_storage_context);
 
   RenderViewHostImpl* render_view_host =
       new RenderViewHostImpl(site_instance.get(),
                              this,
                              this,
                              MSG_ROUTING_NONE,
                              MSG_ROUTING_NONE,
-                             false,
-                             session_storage_namespace_impl);
+                             false);
   web_contents_->RenderViewForInterstitialPageCreated(render_view_host);
   return render_view_host;
 }
 
 WebContentsView* InterstitialPageImpl::CreateWebContentsView() {
   if (!enabled() || !create_view_)
     return NULL;
   WebContentsView* web_contents_view = web_contents()->GetView();
   WebContentsViewPort* web_contents_view_port =
       static_cast<WebContentsViewPort*>(web_contents_view);
@@ skipping 180 matching lines @@
 void InterstitialPageImpl::ShowCreatedWidget(int route_id,
                                              const gfx::Rect& initial_pos) {
   NOTREACHED() << "InterstitialPage does not support showing drop-downs yet.";
 }
 
 void InterstitialPageImpl::ShowCreatedFullscreenWidget(int route_id) {
   NOTREACHED()
       << "InterstitialPage does not support showing full screen popups.";
 }
 
+SessionStorageNamespace* InterstitialPageImpl::GetSessionStorageNamespace(
+    SiteInstance* instance) {
+  return session_storage_namespace_.get();
+}
+
 void InterstitialPageImpl::Disable() {
   enabled_ = false;
 }
 
 void InterstitialPageImpl::Shutdown(RenderViewHostImpl* render_view_host) {
   render_view_host->Shutdown();
   // We are deleted now.
 }
 
 void InterstitialPageImpl::OnNavigatingAwayOrTabClosing() {
@@ skipping 89 matching lines @@
 
   web_contents->GetDelegateView()->TakeFocus(reverse);
 }
 
 void InterstitialPageImpl::InterstitialPageRVHDelegateView::OnFindReply(
     int request_id, int number_of_matches, const gfx::Rect& selection_rect,
     int active_match_ordinal, bool final_update) {
 }
 
 }  // namespace content