Move SessionStorageNamespace entirely into NavigationController and support StoragePartitions.

content/browser/web_contents/test_web_contents.h

 // 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.
 
 #ifndef CONTENT_BROWSER_WEB_CONTENTS_TEST_WEB_CONTENTS_H_
 #define CONTENT_BROWSER_WEB_CONTENTS_TEST_WEB_CONTENTS_H_
 
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/public/common/page_transition_types.h"
 #include "content/public/test/web_contents_tester.h"
 #include "webkit/glue/webpreferences.h"
 
 class SiteInstanceImpl;
 
 namespace content {
 
 class RenderViewHost;
 class TestRenderViewHost;
 class WebContentsTester;
 
 // Subclass WebContentsImpl to ensure it creates TestRenderViewHosts
 // 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;
   virtual RenderViewHost* GetPendingRenderViewHost() const OVERRIDE;
   virtual void NavigateAndCommit(const GURL& url) OVERRIDE;
   virtual void TestSetIsLoading(bool value) OVERRIDE;
   virtual void ProceedWithCrossSiteNavigation() OVERRIDE;
   virtual void TestDidNavigate(RenderViewHost* render_view_host,
                                int page_id,
                                const GURL& url,
@@ skipping 43 matching lines @@
   void ExpectSetHistoryLengthAndPrune(const SiteInstance* site_instance,
                                       int history_length,
                                       int32 min_page_id);
 
   // Compares the arguments passed in with the expected arguments passed in
   // to |ExpectSetHistoryLengthAndPrune()|.
   virtual void SetHistoryLengthAndPrune(const SiteInstance* site_instance,
                                         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,
       const ViewHostMsg_CreateWindow_Params& params,
       SessionStorageNamespace* session_storage_namespace) OVERRIDE;
   virtual void CreateNewWidget(int route_id,
                                WebKit::WebPopupType popup_type) OVERRIDE;
   virtual void CreateNewFullscreenWidget(int route_id) OVERRIDE;
   virtual void ShowCreatedWindow(int route_id,
                                  WindowOpenDisposition disposition,
@@ skipping 10 matching lines @@
   bool expect_set_history_length_and_prune_;
   scoped_refptr<const SiteInstanceImpl>
     expect_set_history_length_and_prune_site_instance_;
   int expect_set_history_length_and_prune_history_length_;
   int32 expect_set_history_length_and_prune_min_page_id_;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_WEB_CONTENTS_TEST_WEB_CONTENTS_H_