Move content_shell and content_browsertests code into the content namespace.

content/shell/shell_main_delegate.h

Index: content/shell/shell_main_delegate.h
===================================================================
--- content/shell/shell_main_delegate.h	(revision 147404)
+++ content/shell/shell_main_delegate.h	(working copy)
@@ -17,35 +17,35 @@
 #if defined(OS_ANDROID)
 class BrowserMainRunner;
 #endif
-}  // namespace content
 
-class ShellMainDelegate : public content::ContentMainDelegate {
+class ShellMainDelegate : public ContentMainDelegate {
  public:
   ShellMainDelegate();
   virtual ~ShellMainDelegate();
 
-  // content::ContentMainDelegate implementation:
+  // ContentMainDelegate implementation:
   virtual bool BasicStartupComplete(int* exit_code) OVERRIDE;
   virtual void PreSandboxStartup() OVERRIDE;
   virtual int RunProcess(
       const std::string& process_type,
-      const content::MainFunctionParams& main_function_params) OVERRIDE;
-  virtual content::ContentBrowserClient* CreateContentBrowserClient() OVERRIDE;
-  virtual content::ContentRendererClient*
-      CreateContentRendererClient() OVERRIDE;
+      const MainFunctionParams& main_function_params) OVERRIDE;
+  virtual ContentBrowserClient* CreateContentBrowserClient() OVERRIDE;
+  virtual ContentRendererClient* CreateContentRendererClient() OVERRIDE;
 
  private:
   void InitializeResourceBundle();
 
-  scoped_ptr<content::ShellContentBrowserClient> browser_client_;
-  scoped_ptr<content::ShellContentRendererClient> renderer_client_;
-  content::ShellContentClient content_client_;
+  scoped_ptr<ShellContentBrowserClient> browser_client_;
+  scoped_ptr<ShellContentRendererClient> renderer_client_;
+  ShellContentClient content_client_;
 
 #if defined(OS_ANDROID)
-  scoped_ptr<content::BrowserMainRunner> browser_runner_;
+  scoped_ptr<BrowserMainRunner> browser_runner_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(ShellMainDelegate);
 };
 
+}  // namespace content
+
 #endif  // CONTENT_SHELL_SHELL_MAIN_DELEGATE_H_