Move content_shell and content_browsertests code into the content namespace.

content/test/content_test_launcher.cc

Index: content/test/content_test_launcher.cc
===================================================================
--- content/test/content_test_launcher.cc	(revision 147404)
+++ content/test/content_test_launcher.cc	(working copy)
@@ -85,8 +85,6 @@
   DISALLOW_COPY_AND_ASSIGN(ContentBrowserTestSuite);
 };
 
-}  // namespace content
-
 class ContentTestLauncherDelegate : public test_launcher::TestLauncherDelegate {
  public:
   ContentTestLauncherDelegate() {
@@ -105,13 +103,13 @@
       ShellMainDelegate delegate;
 #if defined(OS_WIN)
       sandbox::SandboxInterfaceInfo sandbox_info = {0};
-      content::InitializeSandboxInfo(&sandbox_info);
+      InitializeSandboxInfo(&sandbox_info);
       *return_code =
-          content::ContentMain(GetModuleHandle(NULL), &sandbox_info, &delegate);
+          ContentMain(GetModuleHandle(NULL), &sandbox_info, &delegate);
 #elif defined(OS_LINUX)
-      *return_code = content::ContentMain(argc,
-                                          const_cast<const char**>(argv),
-                                          &delegate);
+      *return_code = ContentMain(argc,
+                                 const_cast<const char**>(argv),
+                                 &delegate);
 #endif  // defined(OS_WIN)
       return true;
     }
@@ -121,7 +119,7 @@
   }
 
   virtual int RunTestSuite(int argc, char** argv) OVERRIDE {
-    return content::ContentBrowserTestSuite(argc, argv).Run();
+    return ContentBrowserTestSuite(argc, argv).Run();
   }
 
   virtual bool AdjustChildProcessCommandLine(
@@ -133,7 +131,9 @@
   DISALLOW_COPY_AND_ASSIGN(ContentTestLauncherDelegate);
 };
 
+}  // namespace content
+
 int main(int argc, char** argv) {
-  ContentTestLauncherDelegate launcher_delegate;
+  content::ContentTestLauncherDelegate launcher_delegate;
   return test_launcher::LaunchTests(&launcher_delegate, argc, argv);
 }