diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-19 17:43:21 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-19 17:43:21 +0000 |
| commit | bdcf915f370e489bb9b7934feca5711b3cc6bece (patch) | |
| tree | f67a450b1859c8e8565d1b150e7ca9915241938c /content/test/content_browser_test.h | |
| parent | d346c5e45c83968c9d85c9ee8f792a6f001fa5c8 (diff) | |
| download | chromium_src-bdcf915f370e489bb9b7934feca5711b3cc6bece.zip chromium_src-bdcf915f370e489bb9b7934feca5711b3cc6bece.tar.gz chromium_src-bdcf915f370e489bb9b7934feca5711b3cc6bece.tar.bz2 | |
Move content_shell and content_browsertests code into the content namespace.
BUG=90448
TBR=jochen
Review URL: https://chromiumcodereview.appspot.com/10809016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@147473 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/test/content_browser_test.h')
| -rw-r--r-- | content/test/content_browser_test.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/content/test/content_browser_test.h b/content/test/content_browser_test.h index 44bf42d..0d09774 100644 --- a/content/test/content_browser_test.h +++ b/content/test/content_browser_test.h @@ -9,11 +9,10 @@ #include "content/public/test/browser_test.h" #include "content/test/browser_test_base.h" -class ShellMainDelegate; namespace content { class Shell; -} +class ShellMainDelegate; class ContentBrowserTest : public BrowserTestBase { protected: @@ -28,12 +27,14 @@ class ContentBrowserTest : public BrowserTestBase { virtual void RunTestOnMainThreadLoop() OVERRIDE; // Returns the window for the test. - content::Shell* shell() const { return shell_; } + Shell* shell() const { return shell_; } private: - scoped_ptr<ShellMainDelegate> shell_main_delegate_; + scoped_ptr<content::ShellMainDelegate> shell_main_delegate_; - content::Shell* shell_; + Shell* shell_; }; +} // namespace content + #endif // CONTENT_TEST_CONTENT_BROWSER_TEST_H_ |