Move SessionStorageNamespace entirely into NavigationController and support StoragePartitions.

content/test/web_contents_tester.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/public/test/web_contents_tester.h"
 
 #include "content/browser/web_contents/test_web_contents.h"
 
 namespace content {
 
 namespace {
 
 // The two subclasses here are instantiated via the deprecated
 // CreateWebContentsFor... factories below.
 
 class TestWebContentsCountFocus : public TestWebContents {
  public:
-  TestWebContentsCountFocus(content::BrowserContext* browser_context,
-                       content::SiteInstance* instance)
-      : TestWebContents(browser_context, instance), focus_called_(0) {
+  explicit TestWebContentsCountFocus(content::BrowserContext* browser_context)
+      : TestWebContents(browser_context), focus_called_(0) {
   }
 
   virtual int GetNumberOfFocusCalls() OVERRIDE {
     return focus_called_;
   }
 
   virtual void Focus() OVERRIDE {
     focus_called_++;
   }
 
  private:
   int focus_called_;
 };
 
 class TestWebContentsCountSetFocusToLocationBar : public TestWebContents {
  public:
-  TestWebContentsCountSetFocusToLocationBar(
-      content::BrowserContext* browser_context,
-      SiteInstance* instance)
-      : TestWebContents(browser_context, instance), focus_called_(0) {
+  explicit TestWebContentsCountSetFocusToLocationBar(
+      content::BrowserContext* browser_context)
+      : TestWebContents(browser_context), focus_called_(0) {
   }
 
   virtual void SetFocusToLocationBar(bool select_all) { ++focus_called_; }
   virtual int GetNumberOfFocusCalls() OVERRIDE {
     return focus_called_;
   }
 
  private:
   int focus_called_;
 };
 
 }  // namespace
 
 // static
 WebContentsTester* WebContentsTester::For(WebContents* contents) {
   return static_cast<TestWebContents*>(contents);
 }
 
 // static
 WebContents* WebContentsTester::CreateTestWebContents(
     BrowserContext* browser_context,
     SiteInstance* instance) {
-  return new TestWebContents(browser_context, instance);
+  return TestWebContents::Create(browser_context, instance);
 }
 
 // static
 WebContents* WebContentsTester::CreateTestWebContentsCountSetFocusToLocationBar(
     BrowserContext* browser_context,
     SiteInstance* instance) {
-  return new TestWebContentsCountSetFocusToLocationBar(
-      browser_context, instance);
+  TestWebContentsCountSetFocusToLocationBar* web_contents =
+      new TestWebContentsCountSetFocusToLocationBar(browser_context);
+  web_contents->Init(browser_context, instance, MSG_ROUTING_NONE, NULL);
+  return web_contents;
 }
 
 // static
 WebContents* WebContentsTester::CreateTestWebContentsCountFocus(
     BrowserContext* browser_context,
     SiteInstance* instance) {
-  return new TestWebContentsCountFocus(browser_context, instance);
+  TestWebContentsCountFocus* web_contents =
+      new TestWebContentsCountFocus(browser_context);
+  web_contents->Init(browser_context, instance, MSG_ROUTING_NONE, NULL);
+  return web_contents;
 }
 
 }  // namespace content