summaryrefslogtreecommitdiffstats
path: root/content/test/layout_browsertest.h
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-25 17:15:28 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-25 17:15:28 +0000
commit71d504f2410920009ce8429eb8d4e7d19db70707 (patch)
treeef0f58c9e69d715f968c21e8c07e623309c2a4e9 /content/test/layout_browsertest.h
parent5d96bbe5e4dca8d2282a29fa0c4911314733dee5 (diff)
downloadchromium_src-71d504f2410920009ce8429eb8d4e7d19db70707.zip
chromium_src-71d504f2410920009ce8429eb8d4e7d19db70707.tar.gz
chromium_src-71d504f2410920009ce8429eb8d4e7d19db70707.tar.bz2
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
Diffstat (limited to 'content/test/layout_browsertest.h')
-rw-r--r--content/test/layout_browsertest.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/content/test/layout_browsertest.h b/content/test/layout_browsertest.h
index 5f2ed83..9f9cec9b 100644
--- a/content/test/layout_browsertest.h
+++ b/content/test/layout_browsertest.h
@@ -4,11 +4,12 @@
#include "base/file_path.h"
#include "base/scoped_temp_dir.h"
-#include "chrome/test/base/in_process_browser_test.h"
+#include "content/test/content_browser_test.h"
+class GURL;
class LayoutTestHttpServer;
-class InProcessBrowserLayoutTest : public InProcessBrowserTest {
+class InProcessBrowserLayoutTest : public content::ContentBrowserTest {
public:
explicit InProcessBrowserLayoutTest(const FilePath& test_parent_dir,
const FilePath& test_case_dir);