Move all the layout tests that ran under browser_tests to run under content_browsertests.

To support the new tests, I added new methods to create new normal/incognito windows in content_browsertests.

BUG=90448
Review URL: https://chromiumcodereview.appspot.com/10820007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148349 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 9 insertions, 1 deletions

diff --git a/content/test/content_browser_test.h b/content/test/content_browser_test.h
index e0acdf8..c9b6da2 100644
--- a/content/test/content_browser_test.h
+++ b/content/test/content_browser_test.h
@@ -9,6 +9,8 @@
 #include "content/public/test/browser_test.h"
 #include "content/test/browser_test_base.h"
 
+class GURL;
+
 namespace content {
 class Shell;
 class ShellMainDelegate;
@@ -26,11 +28,17 @@ class ContentBrowserTest : public BrowserTestBase {
   virtual void RunTestOnMainThreadLoop() OVERRIDE;
 
  protected:
+  // Creates a new window and loads about:blank.
+  Shell* CreateBrowser();
+
+  // Creates an off-the-record window and loads about:blank.
+  Shell* CreateOffTheRecordBrowser();
+
   // Returns the window for the test.
   Shell* shell() const { return shell_; }
 
  private:
-   scoped_ptr<content::ShellMainDelegate> shell_main_delegate_;
+  scoped_ptr<content::ShellMainDelegate> shell_main_delegate_;
 
   Shell* shell_;
 };