Move SessionStorageNamespace entirely into NavigationController and support StoragePartitions.

content/browser/web_contents/test_web_contents.h

Index: content/browser/web_contents/test_web_contents.h
diff --git a/content/browser/web_contents/test_web_contents.h b/content/browser/web_contents/test_web_contents.h
index d8ab7dd7ae346e7f76d28eb80604e97a2f99bbce..edc763080d98a43edcf49510cfa6061948285ccc 100644
--- a/content/browser/web_contents/test_web_contents.h
+++ b/content/browser/web_contents/test_web_contents.h
@@ -22,9 +22,11 @@ class WebContentsTester;
 // and does not do anything involving views.
 class TestWebContents : public WebContentsImpl, public WebContentsTester {
  public:
-  TestWebContents(BrowserContext* browser_context, SiteInstance* instance);
   virtual ~TestWebContents();
 
+  static TestWebContents* Create(BrowserContext* browser_context,
+                                 SiteInstance* instance);
+
   // WebContentsTester implementation.
   virtual void CommitPendingNavigation() OVERRIDE;
   virtual int GetNumberOfFocusCalls() OVERRIDE;
@@ -88,7 +90,12 @@ class TestWebContents : public WebContentsImpl, public WebContentsTester {
                                         int history_length,
                                         int32 min_page_id) OVERRIDE;
 
+ protected:
+  // The deprecated WebContentsTester still needs to subclass this.
+  explicit TestWebContents(BrowserContext* browser_context);
+
  private:
+

[Charlie Reis, 2012/08/02 23:06:47]

No newline here?

[awong, 2012/08/03 00:31:04]

Done.

   // WebContentsImpl overrides
   virtual void CreateNewWindow(
       int route_id,