Move content_shell and content_browsertests code into the content namespace.

content/shell/shell_content_browser_client.h

 // 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.
 
 #ifndef CONTENT_SHELL_SHELL_CONTENT_BROWSER_CLIENT_H_
 #define CONTENT_SHELL_SHELL_CONTENT_BROWSER_CLIENT_H_
 
 #include <string>
 
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "content/public/browser/content_browser_client.h"
 
 namespace content {
 
 class ShellBrowserContext;
 class ShellBrowserMainParts;
 class ShellResourceDispatcherHostDelegate;
 
 class ShellContentBrowserClient : public ContentBrowserClient {
  public:
   ShellContentBrowserClient();
   virtual ~ShellContentBrowserClient();
 
-  // content::ContentBrowserClient overrides.
+  // ContentBrowserClient overrides.
   virtual BrowserMainParts* CreateBrowserMainParts(
-      const content::MainFunctionParams& parameters) OVERRIDE;
+      const MainFunctionParams& parameters) OVERRIDE;
   virtual void RenderViewHostCreated(
       RenderViewHost* render_view_host) OVERRIDE;
   virtual void AppendExtraCommandLineSwitches(CommandLine* command_line,
                                               int child_process_id) OVERRIDE;
   virtual void ResourceDispatcherHostCreated() OVERRIDE;
   virtual AccessTokenStore* CreateAccessTokenStore() OVERRIDE;
   virtual std::string GetDefaultDownloadName() OVERRIDE;
 
 #if defined(OS_ANDROID)
   virtual void GetAdditionalMappedFilesForChildProcess(
       const CommandLine& command_line,
       base::GlobalDescriptors::Mapping* mappings) OVERRIDE;
 #endif
 
   ShellBrowserContext* browser_context();
 
  private:
   scoped_ptr<ShellResourceDispatcherHostDelegate>
       resource_dispatcher_host_delegate_;
 
   ShellBrowserMainParts* shell_browser_main_parts_;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_SHELL_SHELL_CONTENT_BROWSER_CLIENT_H_