Fix SessionStorage confusion between RenderViewHostImpl and NavigationController.

content/browser/renderer_host/test_render_view_host.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/renderer_host/test_render_view_host.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/test_backing_store.h"
 #include "content/browser/site_instance_impl.h"
 #include "content/common/view_messages.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/storage_partition.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/page_state.h"
 #include "content/public/common/password_form.h"
 #include "content/test/test_web_contents.h"
 #include "media/base/video_frame.h"
 #include "ui/gfx/rect.h"
 #include "webkit/common/dom_storage/dom_storage_types.h"
 #include "webkit/common/webpreferences.h"
 
 namespace content {
 
 namespace {
-// Normally this is done by the NavigationController, but we'll fake it out
-// here for testing.
-SessionStorageNamespaceImpl* CreateSessionStorageNamespace(
-    SiteInstance* instance) {
-  RenderProcessHost* process_host = instance->GetProcess();
-  DOMStorageContext* dom_storage_context =
-      BrowserContext::GetStoragePartition(process_host->GetBrowserContext(),
-                                          instance)->GetDOMStorageContext();
-  return new SessionStorageNamespaceImpl(
-      static_cast<DOMStorageContextImpl*>(dom_storage_context));
-}
 
 const int64 kFrameId = 13UL;
 
 }  // namespace
 
 
 void InitNavigateParams(ViewHostMsg_FrameNavigate_Params* params,
                         int page_id,
                         const GURL& url,
                         PageTransition transition) {
@@ skipping 203 matching lines @@
     RenderViewHostDelegate* delegate,
     RenderWidgetHostDelegate* widget_delegate,
     int routing_id,
     int main_frame_routing_id,
     bool swapped_out)
     : RenderViewHostImpl(instance,
                          delegate,
                          widget_delegate,
                          routing_id,
                          main_frame_routing_id,
-                         swapped_out,
-                         CreateSessionStorageNamespace(instance)),
+                         swapped_out),
       render_view_created_(false),
       delete_counter_(NULL),
       simulate_fetch_via_proxy_(false),
       simulate_history_list_was_cleared_(false),
       contents_mime_type_("text/html") {
   // TestRenderWidgetHostView installs itself into this->view_ in its
   // constructor, and deletes itself when TestRenderWidgetHostView::Destroy() is
   // called.
   new TestRenderWidgetHostView(this);
 
@@ skipping 152 matching lines @@
 
 TestRenderViewHost* RenderViewHostImplTestHarness::active_test_rvh() {
   return static_cast<TestRenderViewHost*>(active_rvh());
 }
 
 TestWebContents* RenderViewHostImplTestHarness::contents() {
   return static_cast<TestWebContents*>(web_contents());
 }
 
 }  // namespace content