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

content/browser/zygote_host/zygote_host_impl_linux.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/zygote_host/zygote_host_impl_linux.h"
 
 #include <sys/socket.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
@@ skipping 21 matching lines @@
 #include "content/public/common/content_switches.h"
 #include "content/public/common/result_codes.h"
 #include "sandbox/linux/suid/client/setuid_sandbox_client.h"
 #include "sandbox/linux/suid/common/sandbox.h"
 #include "ui/base/ui_base_switches.h"
 
 #if defined(USE_TCMALLOC)
 #include "third_party/tcmalloc/chromium/src/gperftools/heap-profiler.h"
 #endif
 
+namespace content {
+
 // static
-content::ZygoteHost* content::ZygoteHost::GetInstance() {
+ZygoteHost* ZygoteHost::GetInstance() {
   return ZygoteHostImpl::GetInstance();
 }
 
 ZygoteHostImpl::ZygoteHostImpl()
     : control_fd_(-1),
       pid_(-1),
       init_(false),
       using_suid_sandbox_(false),
       have_read_sandbox_status_word_(false),
       sandbox_status_(0) {}
@@ skipping 21 matching lines @@
   int fds[2];
 #if defined(OS_FREEBSD) || defined(OS_OPENBSD)
   // The BSDs often don't support SOCK_SEQPACKET yet, so fall back to
   // SOCK_DGRAM if necessary.
   if (socketpair(PF_UNIX, SOCK_SEQPACKET, 0, fds) != 0)
     CHECK(socketpair(PF_UNIX, SOCK_DGRAM, 0, fds) == 0);
 #else
   CHECK(socketpair(PF_UNIX, SOCK_SEQPACKET, 0, fds) == 0);
 #endif
   base::FileHandleMappingVector fds_to_map;
-  fds_to_map.push_back(std::make_pair(fds[1], content::kZygoteSocketPairFd));
+  fds_to_map.push_back(std::make_pair(fds[1], kZygoteSocketPairFd));
 
   const CommandLine& browser_command_line = *CommandLine::ForCurrentProcess();
   if (browser_command_line.HasSwitch(switches::kZygoteCmdPrefix)) {
     cmd_line.PrependWrapper(
         browser_command_line.GetSwitchValueNative(switches::kZygoteCmdPrefix));
   }
   // Append any switches from the browser process that need to be forwarded on
   // to the zygote/renderers.
   // Should this list be obtained from browser_render_process_host.cc?
   static const char* kForwardSwitches[] = {
@@ skipping 14 matching lines @@
 
     switches::kNoSandbox,
 
 #if !defined(OS_CHROMEOS)
     switches::kEnableTouchEvents,
 #endif
   };
   cmd_line.CopySwitchesFrom(browser_command_line, kForwardSwitches,
                             arraysize(kForwardSwitches));
 
-  content::GetContentClient()->browser()->AppendExtraCommandLineSwitches(
-      &cmd_line, -1);
+  GetContentClient()->browser()->AppendExtraCommandLineSwitches(&cmd_line, -1);
 
   sandbox_binary_ = sandbox_cmd.c_str();
 
   if (!sandbox_cmd.empty()) {
     struct stat st;
     if (stat(sandbox_binary_.c_str(), &st) != 0) {
       LOG(FATAL) << "The SUID sandbox helper binary is missing: "
                  << sandbox_binary_ << " Aborting now.";
     }
 
@@ skipping 15 matching lines @@
     }
   } else {
     LOG(WARNING) << "Running without the SUID sandbox! See "
         "http://code.google.com/p/chromium/wiki/LinuxSUIDSandboxDevelopment "
         "for more information on developing with the sandbox on.";
   }
 
   // Start up the sandbox host process and get the file descriptor for the
   // renderers to talk to it.
   const int sfd = RenderSandboxHostLinux::GetInstance()->GetRendererSocket();
-  fds_to_map.push_back(std::make_pair(sfd, content::kZygoteRendererSocketFd));
+  fds_to_map.push_back(std::make_pair(sfd, kZygoteRendererSocketFd));
 
   int dummy_fd = -1;
   if (using_suid_sandbox_) {
     dummy_fd = socket(PF_UNIX, SOCK_DGRAM, 0);
     CHECK(dummy_fd >= 0);
-    fds_to_map.push_back(std::make_pair(dummy_fd, content::kZygoteIdFd));
+    fds_to_map.push_back(std::make_pair(dummy_fd, kZygoteIdFd));
   }
 
   base::ProcessHandle process = -1;
   base::LaunchOptions options;
   options.fds_to_remap = &fds_to_map;
   base::LaunchProcess(cmd_line.argv(), options, &process);
   CHECK(process != -1) << "Failed to launch zygote process";
 
   if (using_suid_sandbox_) {
     // In the SUID sandbox, the real zygote is forked from the sandbox.
     // We need to look for it.
     // But first, wait for the zygote to tell us it's running.
     // The sending code is in content/browser/zygote_main_linux.cc.
     std::vector<int> fds_vec;
-    const int kExpectedLength = sizeof(content::kZygoteHelloMessage);
+    const int kExpectedLength = sizeof(kZygoteHelloMessage);
     char buf[kExpectedLength];
     const ssize_t len = UnixDomainSocket::RecvMsg(fds[0], buf, sizeof(buf),
                                                   &fds_vec);
     CHECK(len == kExpectedLength) << "Incorrect zygote magic length";
-    CHECK(0 == strcmp(buf, content::kZygoteHelloMessage))
+    CHECK(0 == strcmp(buf, kZygoteHelloMessage))
         << "Incorrect zygote hello";
 
     std::string inode_output;
     ino_t inode = 0;
     // Figure out the inode for |dummy_fd|, close |dummy_fd| on our end,
     // and find the zygote process holding |dummy_fd|.
     if (base::FileDescriptorGetInode(&inode, dummy_fd)) {
       close(dummy_fd);
       std::vector<std::string> get_inode_cmdline;
       get_inode_cmdline.push_back(sandbox_binary_);
@@ skipping 13 matching lines @@
     }
   } else {
     // Not using the SUID sandbox.
     pid_ = process;
   }
 
   close(fds[1]);
   control_fd_ = fds[0];
 
   Pickle pickle;
-  pickle.WriteInt(content::kZygoteCommandGetSandboxStatus);
+  pickle.WriteInt(kZygoteCommandGetSandboxStatus);
   if (!SendMessage(pickle, NULL))
     LOG(FATAL) << "Cannot communicate with zygote";
   // We don't wait for the reply. We'll read it in ReadReply.
 }
 
 bool ZygoteHostImpl::SendMessage(const Pickle& data,
                                  const std::vector<int>* fds) {
-  CHECK(data.size() <= content::kZygoteMaxMessageLength)
+  CHECK(data.size() <= kZygoteMaxMessageLength)
       << "Trying to send too-large message to zygote (sending " << data.size()
-      << " bytes, max is " << content::kZygoteMaxMessageLength << ")";
+      << " bytes, max is " << kZygoteMaxMessageLength << ")";
   CHECK(!fds || fds->size() <= UnixDomainSocket::kMaxFileDescriptors)
       << "Trying to send message with too many file descriptors to zygote "
       << "(sending " << fds->size() << ", max is "
       << UnixDomainSocket::kMaxFileDescriptors << ")";
 
   return UnixDomainSocket::SendMsg(control_fd_,
                                    data.data(), data.size(),
                                    fds ? *fds : std::vector<int>());
 }
 
 ssize_t ZygoteHostImpl::ReadReply(void* buf, size_t buf_len) {
   // At startup we send a kZygoteCommandGetSandboxStatus request to the zygote,
   // but don't wait for the reply. Thus, the first time that we read from the
   // zygote, we get the reply to that request.
   if (!have_read_sandbox_status_word_) {
     if (HANDLE_EINTR(read(control_fd_, &sandbox_status_,
                           sizeof(sandbox_status_))) !=
         sizeof(sandbox_status_)) {
       return -1;
     }
     have_read_sandbox_status_word_ = true;
   }
 
   return HANDLE_EINTR(read(control_fd_, buf, buf_len));
 }
 
 pid_t ZygoteHostImpl::ForkRequest(
     const std::vector<std::string>& argv,
-    const std::vector<content::FileDescriptorInfo>& mapping,
+    const std::vector<FileDescriptorInfo>& mapping,
     const std::string& process_type) {
   DCHECK(init_);
   Pickle pickle;
 
-  pickle.WriteInt(content::kZygoteCommandFork);
+  pickle.WriteInt(kZygoteCommandFork);
   pickle.WriteString(process_type);
   pickle.WriteInt(argv.size());
   for (std::vector<std::string>::const_iterator
        i = argv.begin(); i != argv.end(); ++i)
     pickle.WriteString(*i);
 
   pickle.WriteInt(mapping.size());
 
   std::vector<int> fds;
   // Scoped pointers cannot be stored in containers, so we have to use a
   // linked_ptr.
   std::vector<linked_ptr<file_util::ScopedFD> > autodelete_fds;
-  for (std::vector<content::FileDescriptorInfo>::const_iterator
+  for (std::vector<FileDescriptorInfo>::const_iterator
        i = mapping.begin(); i != mapping.end(); ++i) {
     pickle.WriteUInt32(i->id);
     fds.push_back(i->fd.fd);
     if (i->fd.auto_close) {
       // Auto-close means we need to close the FDs after they habe been passed
       // to the other process.
       linked_ptr<file_util::ScopedFD> ptr(
           new file_util::ScopedFD(&(fds.back())));
       autodelete_fds.push_back(ptr);
     }
@@ skipping 154 matching lines @@
   // Low memory notification is currently only implemented on ChromeOS.
   NOTREACHED() << "AdjustLowMemoryMargin not implemented";
 #endif  // defined(OS_CHROMEOS)
 }
 
 
 void ZygoteHostImpl::EnsureProcessTerminated(pid_t process) {
   DCHECK(init_);
   Pickle pickle;
 
-  pickle.WriteInt(content::kZygoteCommandReap);
+  pickle.WriteInt(kZygoteCommandReap);
   pickle.WriteInt(process);
   if (!SendMessage(pickle, NULL))
     LOG(ERROR) << "Failed to send Reap message to zygote";
 }
 
 base::TerminationStatus ZygoteHostImpl::GetTerminationStatus(
     base::ProcessHandle handle,
     int* exit_code) {
   DCHECK(init_);
   Pickle pickle;
-  pickle.WriteInt(content::kZygoteCommandGetTerminationStatus);
+  pickle.WriteInt(kZygoteCommandGetTerminationStatus);
   pickle.WriteInt(handle);
 
   // Set this now to handle the early termination cases.
   if (exit_code)
-    *exit_code = content::RESULT_CODE_NORMAL_EXIT;
+    *exit_code = RESULT_CODE_NORMAL_EXIT;
 
   static const unsigned kMaxMessageLength = 128;
   char buf[kMaxMessageLength];
   ssize_t len;
   {
     base::AutoLock lock(control_lock_);
     if (!SendMessage(pickle, NULL))
       LOG(ERROR) << "Failed to send GetTerminationStatus message to zygote";
     len = ReadReply(buf, sizeof(buf));
   }
@@ skipping 27 matching lines @@
 
 pid_t ZygoteHostImpl::GetSandboxHelperPid() const {
   return RenderSandboxHostLinux::GetInstance()->pid();
 }
 
 int ZygoteHostImpl::GetSandboxStatus() const {
   if (have_read_sandbox_status_word_)
     return sandbox_status_;
   return 0;
 }
+
+}  // namespace content