summaryrefslogtreecommitdiffstats
path: root/content/test/content_browser_test.h
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-19 06:11:28 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-19 06:11:28 +0000
commit78089f0bfcb2e2760db01191ceb0165d9517b154 (patch)
treee371ab6d6bedc40421d351648bfb5e68235d8dff /content/test/content_browser_test.h
parent39e12cb553cf861ab0b34b3ccd82baa3dd82be7f (diff)
downloadchromium_src-78089f0bfcb2e2760db01191ceb0165d9517b154.zip
chromium_src-78089f0bfcb2e2760db01191ceb0165d9517b154.tar.gz
chromium_src-78089f0bfcb2e2760db01191ceb0165d9517b154.tar.bz2
Get content_browsertest working. I've added a simple test for now, and will convert the tests in src/content in future changes.
BUG=90448 Review URL: https://chromiumcodereview.appspot.com/10803026 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@147404 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/test/content_browser_test.h')
-rw-r--r--content/test/content_browser_test.h10
1 files changed, 10 insertions, 0 deletions
diff --git a/content/test/content_browser_test.h b/content/test/content_browser_test.h
index d00077b..44bf42d 100644
--- a/content/test/content_browser_test.h
+++ b/content/test/content_browser_test.h
@@ -6,10 +6,15 @@
#define CONTENT_TEST_CONTENT_BROWSER_TEST_H_
#include "base/memory/scoped_ptr.h"
+#include "content/public/test/browser_test.h"
#include "content/test/browser_test_base.h"
class ShellMainDelegate;
+namespace content {
+class Shell;
+}
+
class ContentBrowserTest : public BrowserTestBase {
protected:
ContentBrowserTest();
@@ -22,8 +27,13 @@ class ContentBrowserTest : public BrowserTestBase {
// BrowserTestBase:
virtual void RunTestOnMainThreadLoop() OVERRIDE;
+ // Returns the window for the test.
+ content::Shell* shell() const { return shell_; }
+
private:
scoped_ptr<ShellMainDelegate> shell_main_delegate_;
+
+ content::Shell* shell_;
};
#endif // CONTENT_TEST_CONTENT_BROWSER_TEST_H_