Move the remaning files in content\common to the content namespace.

content/browser/child_process_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/browser/child_process_launcher.h"
 
 #include <utility>  // For std::pair.
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 20 matching lines @@
 #elif defined(OS_POSIX)
 #include "base/memory/singleton.h"
 #include "content/browser/renderer_host/render_sandbox_host_linux.h"
 #include "content/browser/zygote_host/zygote_host_impl_linux.h"
 #endif
 
 #if defined(OS_POSIX)
 #include "base/global_descriptors_posix.h"
 #endif
 
-using content::BrowserThread;
+namespace content {
 
 // Having the functionality of ChildProcessLauncher be in an internal
 // ref counted object allows us to automatically terminate the process when the
 // parent class destructs, while still holding on to state that we need.
 class ChildProcessLauncher::Context
     : public base::RefCountedThreadSafe<ChildProcessLauncher::Context> {
  public:
   Context()
       : client_(NULL),
         client_thread_id_(BrowserThread::UI),
         termination_status_(base::TERMINATION_STATUS_NORMAL_TERMINATION),
-        exit_code_(content::RESULT_CODE_NORMAL_EXIT),
+        exit_code_(RESULT_CODE_NORMAL_EXIT),
         starting_(true)
 #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
         , zygote_(false)
 #endif
         {
 #if defined(OS_POSIX)
           terminate_child_on_shutdown_ = !CommandLine::ForCurrentProcess()->
               HasSwitch(switches::kChildCleanExit);
 #else
           terminate_child_on_shutdown_ = true;
@@ skipping 95 matching lines @@
 #endif
       CommandLine* cmd_line) {
     scoped_ptr<CommandLine> cmd_line_deleter(cmd_line);
 
 #if defined(OS_WIN)
     base::ProcessHandle handle = sandbox::StartProcessWithAccess(
         cmd_line, exposed_dir);
 #elif defined(OS_ANDROID)
     std::string process_type =
         cmd_line->GetSwitchValueASCII(switches::kProcessType);
-    std::vector<content::FileDescriptorInfo> files_to_register;
+    std::vector<FileDescriptorInfo> files_to_register;
     files_to_register.push_back(
-        content::FileDescriptorInfo(kPrimaryIPCChannel,
-                                    base::FileDescriptor(ipcfd, false)));
+        FileDescriptorInfo(kPrimaryIPCChannel,
+                           base::FileDescriptor(ipcfd, false)));
 
-    content::GetContentClient()->browser()->
+    GetContentClient()->browser()->
         GetAdditionalMappedFilesForChildProcess(*cmd_line, &files_to_register);
 
-    content::StartSandboxedProcess(cmd_line->argv(), files_to_register,
+    StartSandboxedProcess(cmd_line->argv(), files_to_register,
         base::Bind(&ChildProcessLauncher::Context::OnSandboxedProcessStarted,
                    this_object, client_thread_id));
 
 #elif defined(OS_POSIX)
     base::ProcessHandle handle = base::kNullProcessHandle;
     // We need to close the client end of the IPC channel to reliably detect
     // child termination.
     file_util::ScopedFD ipcfd_closer(&ipcfd);
 
     std::string process_type =
         cmd_line->GetSwitchValueASCII(switches::kProcessType);
-    std::vector<content::FileDescriptorInfo> files_to_register;
+    std::vector<FileDescriptorInfo> files_to_register;
     files_to_register.push_back(
-        content::FileDescriptorInfo(kPrimaryIPCChannel,
-                                    base::FileDescriptor(ipcfd, false)));
+        FileDescriptorInfo(kPrimaryIPCChannel,
+                           base::FileDescriptor(ipcfd, false)));
 
 #if !defined(OS_MACOSX)
-    content::GetContentClient()->browser()->
+    GetContentClient()->browser()->
         GetAdditionalMappedFilesForChildProcess(*cmd_line, &files_to_register);
     if (use_zygote) {
       handle = ZygoteHostImpl::GetInstance()->ForkRequest(cmd_line->argv(),
                                                           files_to_register,
                                                           process_type);
     } else
     // Fall through to the normal posix case below when we're not zygoting.
 #endif  // !defined(OS_MACOSX)
     {
       // Convert FD mapping to FileHandleMappingVector
       base::FileHandleMappingVector fds_to_map;
-      for (std::vector<content::FileDescriptorInfo>::const_iterator
+      for (std::vector<FileDescriptorInfo>::const_iterator
            i = files_to_register.begin(); i != files_to_register.end(); ++i) {
-        const content::FileDescriptorInfo& fd_info = *i;
+        const FileDescriptorInfo& fd_info = *i;
         fds_to_map.push_back(std::make_pair(
             fd_info.fd.fd,
             fd_info.id + base::GlobalDescriptors::kBaseDescriptor));
       }
 
 #if !defined(OS_MACOSX)
       if (process_type == switches::kRendererProcess) {
         const int sandbox_fd =
             RenderSandboxHostLinux::GetInstance()->GetRendererSocket();
         fds_to_map.push_back(std::make_pair(
@@ skipping 101 matching lines @@
     process.SetProcessBackgrounded(background);
   }
 
   static void TerminateInternal(
 #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
       bool zygote,
 #endif
       base::ProcessHandle handle) {
 #if defined(OS_ANDROID)
     LOG(INFO) << "ChromeProcess: Stopping process with handle " << handle;
-    content::StopSandboxedProcess(handle);
+    StopSandboxedProcess(handle);
 #else
     base::Process process(handle);
      // Client has gone away, so just kill the process.  Using exit code 0
     // means that UMA won't treat this as a crash.
-    process.Terminate(content::RESULT_CODE_NORMAL_EXIT);
+    process.Terminate(RESULT_CODE_NORMAL_EXIT);
     // On POSIX, we must additionally reap the child.
 #if defined(OS_POSIX)
 #if !defined(OS_MACOSX)
     if (zygote) {
       // If the renderer was created via a zygote, we have to proxy the reaping
       // through the zygote process.
       ZygoteHostImpl::GetInstance()->EnsureProcessTerminated(handle);
     } else
 #endif  // !OS_MACOSX
     {
@@ skipping 101 matching lines @@
       base::Bind(
           &ChildProcessLauncher::Context::SetProcessBackgrounded,
           GetHandle(), background));
 }
 
 void ChildProcessLauncher::SetTerminateChildOnShutdown(
   bool terminate_on_shutdown) {
   if (context_)
     context_->set_terminate_child_on_shutdown(terminate_on_shutdown);
 }
+
+}  // namespace content