Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(748)

Unified Diff: content/test/content_browser_test.cc

Issue 10809016: Move content_shell and content_browsertests code into the content namespace. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: fix android Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/test/content_browser_test.h ('k') | content/test/content_test_launcher.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
« no previous file with comments | « content/test/content_browser_test.h ('k') | content/test/content_test_launcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698