Move content_shell and content_browsertests code into the content namespace.

content/shell/shell_main_delegate.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/shell/shell_main_delegate.h"
 
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/logging.h"
 #include "base/path_service.h"
@@ skipping 26 matching lines @@
       log_filename.value().c_str(),
       logging::LOG_ONLY_TO_FILE,
       logging::LOCK_LOG_FILE,
       logging::DELETE_OLD_LOG_FILE,
       logging::DISABLE_DCHECK_FOR_NON_OFFICIAL_RELEASE_BUILDS);
   logging::SetLogItems(true, true, true, true);
 }
 
 }  // namespace
 
+namespace content {
+
 ShellMainDelegate::ShellMainDelegate() {
 }
 
 ShellMainDelegate::~ShellMainDelegate() {
 #if defined(OS_ANDROID)
   NOTREACHED();
 #endif
 }
 
 bool ShellMainDelegate::BasicStartupComplete(int* exit_code) {
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kDumpRenderTree)) {
     InitLogging();
     CommandLine::ForCurrentProcess()->AppendSwitch(
         switches::kAllowFileAccessFromFiles);
   }
 #if defined(OS_MACOSX)
   OverrideFrameworkBundlePath();
 #endif
-  content::SetContentClient(&content_client_);
+  SetContentClient(&content_client_);
   return false;
 }
 
 void ShellMainDelegate::PreSandboxStartup() {
 #if defined(OS_MACOSX)
   OverrideChildProcessPath();
 #endif  // OS_MACOSX
   InitializeResourceBundle();
 }
 
 int ShellMainDelegate::RunProcess(
     const std::string& process_type,
-    const content::MainFunctionParams& main_function_params) {
+    const MainFunctionParams& main_function_params) {
   if (!process_type.empty())
     return -1;
 
 #if !defined(OS_ANDROID)
   return ShellBrowserMain(main_function_params);
 #else
   // If no process type is specified, we are creating the main browser process.
-  browser_runner_.reset(content::BrowserMainRunner::Create());
+  browser_runner_.reset(BrowserMainRunner::Create());
   int exit_code = browser_runner_->Initialize(main_function_params);
   DCHECK(exit_code < 0)
       << "BrowserRunner::Initialize failed in ShellMainDelegate";
 
   return exit_code;
 #endif
 }
 
 void ShellMainDelegate::InitializeResourceBundle() {
 #if defined(OS_ANDROID)
@@ skipping 22 matching lines @@
   pak_dir = pak_dir.Append(FILE_PATH_LITERAL("paks"));
 #else
   PathService::Get(base::DIR_MODULE, &pak_dir);
 #endif
 
   pak_file = pak_dir.Append(FILE_PATH_LITERAL("content_shell.pak"));
 #endif
   ui::ResourceBundle::InitSharedInstanceWithPakPath(pak_file);
 }
 
-content::ContentBrowserClient* ShellMainDelegate::CreateContentBrowserClient() {
-  browser_client_.reset(new content::ShellContentBrowserClient);
+ContentBrowserClient* ShellMainDelegate::CreateContentBrowserClient() {
+  browser_client_.reset(new ShellContentBrowserClient);
   return browser_client_.get();
 }
 
-content::ContentRendererClient*
-    ShellMainDelegate::CreateContentRendererClient() {
-  renderer_client_.reset(new content::ShellContentRendererClient);
+ContentRendererClient* ShellMainDelegate::CreateContentRendererClient() {
+  renderer_client_.reset(new ShellContentRendererClient);
   return renderer_client_.get();
 }
+
+}  // namespace content