Move SessionStorageNamespace entirely into NavigationController and support StoragePartitions.

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"
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "base/threading/thread.h"
 #include "base/utf_string_conversions.h"
+#include "content/browser/dom_storage/dom_storage_context_impl.h"
+#include "content/browser/dom_storage/session_storage_namespace_impl.h"
 #include "content/browser/renderer_host/render_process_host_impl.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/renderer_host/resource_dispatcher_host_impl.h"
 #include "content/browser/site_instance_impl.h"
 #include "content/browser/web_contents/navigation_controller_impl.h"
 #include "content/browser/web_contents/navigation_entry_impl.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/common/view_messages.h"
 #include "content/port/browser/render_view_host_delegate_view.h"
 #include "content/port/browser/render_widget_host_view_port.h"
+#include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
+#include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/dom_operation_notification_details.h"
 #include "content/public/browser/interstitial_page_delegate.h"
 #include "content/public/browser/invalidate_type.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/web_contents_view.h"
 #include "content/public/common/bindings_policy.h"
 #include "content/public/common/page_transition_types.h"
 #include "net/base/escape.h"
 #include "net/url_request/url_request_context_getter.h"
@@ skipping 184 matching lines @@
 
   if (new_navigation_) {
     NavigationEntryImpl* entry = new NavigationEntryImpl;
     entry->SetURL(url_);
     entry->SetVirtualURL(url_);
     entry->set_page_type(content::PAGE_TYPE_INTERSTITIAL);
 
     // Give delegates a chance to set some states on the navigation entry.
     delegate_->OverrideEntry(entry);
 
-    web_contents_->GetControllerImpl().AddTransientEntry(entry);
+    web_contents_->GetController().AddTransientEntry(entry);
   }
 
   DCHECK(!render_view_host_);
   render_view_host_ = static_cast<RenderViewHostImpl*>(CreateRenderViewHost());
   CreateWebContentsView();
 
   std::string data_url = "data:text/html;charset=utf-8," +
                          net::EscapePath(delegate_->GetHTMLContents());
   render_view_host_->NavigateToURL(GURL(data_url));
 
@@ skipping 229 matching lines @@
 void InterstitialPageImpl::HandleKeyboardEvent(
       const NativeWebKeyboardEvent& event) {
   return web_contents_->HandleKeyboardEvent(event);
 }
 
 WebContents* InterstitialPageImpl::web_contents() const {
   return web_contents_;
 }
 
 RenderViewHost* InterstitialPageImpl::CreateRenderViewHost() {
+  // Interstitial pages don't want to share the session storage so we mint a
+  // new one.
+  using content::BrowserContext;
+  BrowserContext* browser_context = web_contents()->GetBrowserContext();
+  scoped_refptr<SiteInstance> site_instance =
+      SiteInstance::Create(browser_context);
+  const std::string& partition_id =
+      content::GetContentClient()->browser()->
+          GetStoragePartitionIdForSiteInstance(browser_context,
+                                               site_instance);
+  DOMStorageContextImpl* dom_storage_context =
+      static_cast<DOMStorageContextImpl*>(
+          BrowserContext::GetDOMStorageContextByPartitionId(browser_context,
+                                                            partition_id));
+  SessionStorageNamespaceImpl* session_storage_namespace_impl =
+      new SessionStorageNamespaceImpl(dom_storage_context);
+
   RenderViewHostImpl* render_view_host = new RenderViewHostImpl(
-      SiteInstance::Create(web_contents()->GetBrowserContext()), this, this,
-      MSG_ROUTING_NONE, false, NULL);
+      site_instance, this, this, MSG_ROUTING_NONE, false,
+      session_storage_namespace_impl);
   web_contents_->RenderViewForInterstitialPageCreated(render_view_host);
   return render_view_host;
 }
 
 WebContentsView* InterstitialPageImpl::CreateWebContentsView() {
   if (!create_view_)
     return NULL;
   WebContentsView* web_contents_view = web_contents()->GetView();
   RenderWidgetHostView* view =
       web_contents_view->CreateViewForWidget(render_view_host_);
@@ skipping 244 matching lines @@
   if (!web_contents->GetDelegateView())
     return;
 
   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) {
 }