Move SessionStorageNamespace entirely into NavigationController and support StoragePartitions.

content/browser/web_contents/test_web_contents.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/test_web_contents.h"
 
 #include <utility>
 
 #include "content/browser/browser_url_handler_impl.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/renderer_host/test_render_view_host.h"
 #include "content/browser/site_instance_impl.h"
 #include "content/browser/web_contents/navigation_entry_impl.h"
 #include "content/common/view_messages.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/common/page_transition_types.h"
 #include "content/public/test/mock_render_process_host.h"
 #include "webkit/forms/password_form.h"
 #include "webkit/glue/webkit_glue.h"
 
 namespace content {
 
-TestWebContents::TestWebContents(BrowserContext* browser_context,
-                                 SiteInstance* instance)
-    : WebContentsImpl(browser_context, instance, MSG_ROUTING_NONE, NULL, NULL,
-                      NULL),
+TestWebContents::TestWebContents(BrowserContext* browser_context)
+    : WebContentsImpl(browser_context, NULL),
       transition_cross_site(false),
       delegate_view_override_(NULL),
       expect_set_history_length_and_prune_(false),
       expect_set_history_length_and_prune_site_instance_(NULL),
       expect_set_history_length_and_prune_history_length_(0),
       expect_set_history_length_and_prune_min_page_id_(-1) {
 }
 
+TestWebContents* TestWebContents::Create(BrowserContext* browser_context,
+                                         SiteInstance* instance) {
+  TestWebContents* test_web_contents = new TestWebContents(browser_context);
+  test_web_contents->Init(browser_context, instance, MSG_ROUTING_NONE, NULL);
+  return test_web_contents;
+}
+
 TestWebContents::~TestWebContents() {
 }
 
 RenderViewHost* TestWebContents::GetPendingRenderViewHost() const {
   return render_manager_.pending_render_view_host_;
 }
 
 TestRenderViewHost* TestWebContents::pending_test_rvh() const {
   return static_cast<TestRenderViewHost*>(GetPendingRenderViewHost());
 }
@@ skipping 45 matching lines @@
   static_cast<RenderViewHostImpl*>(
       render_view_host)->CreateRenderView(string16(),
                                           opener_route_id,
                                           -1,
                                           std::string(),
                                           -1);
   return true;
 }
 
 WebContents* TestWebContents::Clone() {
-  WebContentsImpl* contents = new TestWebContents(
-      GetBrowserContext(),
-      SiteInstance::Create(GetBrowserContext()));
-  contents->GetControllerImpl().CopyStateFrom(controller_);
+  WebContentsImpl* contents =
+      Create(GetBrowserContext(), SiteInstance::Create(GetBrowserContext()));
+  contents->GetController().CopyStateFrom(controller_);
   return contents;
 }
 
 void TestWebContents::NavigateAndCommit(const GURL& url) {
   GetController().LoadURL(
       url, Referrer(), PAGE_TRANSITION_LINK, std::string());
   GURL loaded_url(url);
   bool reverse_on_redirect = false;
   BrowserURLHandlerImpl::GetInstance()->RewriteURLIfNecessary(
       &loaded_url, GetBrowserContext(), &reverse_on_redirect);
@@ skipping 102 matching lines @@
 }
 
 void TestWebContents::ShowCreatedWidget(int route_id,
                                         const gfx::Rect& initial_pos) {
 }
 
 void TestWebContents::ShowCreatedFullscreenWidget(int route_id) {
 }
 
 }  // namespace content