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.cc | |
| 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.cc')
| -rw-r--r-- | content/test/content_browser_test.cc | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/content/test/content_browser_test.cc b/content/test/content_browser_test.cc index a863d65..d3d6163 100644 --- a/content/test/content_browser_test.cc +++ b/content/test/content_browser_test.cc @@ -20,6 +20,8 @@ #include "base/mac/scoped_nsautorelease_pool.h" #endif +namespace content { + ContentBrowserTest::ContentBrowserTest() { #if defined(OS_MACOSX) // See comment in InProcessBrowserTest::InProcessBrowserTest(). @@ -36,7 +38,7 @@ ContentBrowserTest::~ContentBrowserTest() { } void ContentBrowserTest::SetUp() { - shell_main_delegate_.reset(new ShellMainDelegate); + shell_main_delegate_.reset(new content::ShellMainDelegate); shell_main_delegate_->PreSandboxStartup(); CommandLine* command_line = CommandLine::ForCurrentProcess(); @@ -74,8 +76,8 @@ static void DumpStackTraceSignalHandler(int signal) { #endif // defined(OS_POSIX) void ContentBrowserTest::RunTestOnMainThreadLoop() { - CHECK_EQ(content::Shell::windows().size(), 1u); - shell_ = content::Shell::windows()[0]; + CHECK_EQ(Shell::windows().size(), 1u); + shell_ = Shell::windows()[0]; #if defined(OS_POSIX) signal(SIGTERM, DumpStackTraceSignalHandler); @@ -104,3 +106,5 @@ void ContentBrowserTest::RunTestOnMainThreadLoop() { pool.Recycle(); #endif } + +} // namespace content |