Move content_shell and content_browsertests code into the content namespace.

content/test/content_test_launcher.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/public/test/test_launcher.h"
 
 #include "base/base_paths.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/path_service.h"
@@ skipping 67 matching lines @@
     return new ShellContentClient();
   }
 
 #if defined(OS_WIN)
   ui::ScopedOleInitializer ole_initializer_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(ContentBrowserTestSuite);
 };
 
-}  // namespace content
-
 class ContentTestLauncherDelegate : public test_launcher::TestLauncherDelegate {
  public:
   ContentTestLauncherDelegate() {
   }
 
   virtual ~ContentTestLauncherDelegate() {
   }
 
   virtual void EarlyInitialize() OVERRIDE {
   }
 
   virtual bool Run(int argc, char** argv, int* return_code) OVERRIDE {
 #if defined(OS_WIN) || defined(OS_LINUX)
     CommandLine* command_line = CommandLine::ForCurrentProcess();
     if (command_line->HasSwitch(switches::kProcessType)) {
       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;
     }
 #endif  // defined(OS_WIN) || defined(OS_LINUX)
 
     return false;
   }
 
   virtual int RunTestSuite(int argc, char** argv) OVERRIDE {
-    return content::ContentBrowserTestSuite(argc, argv).Run();
+    return ContentBrowserTestSuite(argc, argv).Run();
   }
 
   virtual bool AdjustChildProcessCommandLine(
       CommandLine* command_line) OVERRIDE {
     return true;
   }
 
  private:
   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);
 }