| Index: content/test/content_browser_test.cc
|
| ===================================================================
|
| --- content/test/content_browser_test.cc (revision 147404)
|
| +++ content/test/content_browser_test.cc (working copy)
|
| @@ -19,6 +19,8 @@
|
| #include "base/mac/scoped_nsautorelease_pool.h"
|
| #endif
|
|
|
| +namespace content {
|
| +
|
| ContentBrowserTest::ContentBrowserTest() {
|
| #if defined(OS_MACOSX)
|
| // See comment in InProcessBrowserTest::InProcessBrowserTest().
|
| @@ -35,7 +37,7 @@
|
| }
|
|
|
| void ContentBrowserTest::SetUp() {
|
| - shell_main_delegate_.reset(new ShellMainDelegate);
|
| + shell_main_delegate_.reset(new content::ShellMainDelegate);
|
| shell_main_delegate_->PreSandboxStartup();
|
|
|
| #if defined(OS_MACOSX)
|
| @@ -71,8 +73,8 @@
|
| #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);
|
| @@ -101,3 +103,5 @@
|
| pool.Recycle();
|
| #endif
|
| }
|
| +
|
| +} // namespace content
|
|
|