Cleanup: Remove base::environment_vector and base::file_handle_mapping_vector to StudlyCaps.

chrome/browser/chromeos/process_proxy/process_proxy.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 "chrome/browser/chromeos/process_proxy/process_proxy.h"
 
-#include <cstdio>
 #include <fcntl.h>
 #include <stdlib.h>
 #include <sys/ioctl.h>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/eintr_wrapper.h"
 #include "base/file_util.h"
 #include "base/process_util.h"
 #include "base/logging.h"
@@ skipping 95 matching lines @@
   // We may receive some output even after Close was called (crosh process does
   // not have to quit instantly, or there may be some trailing data left in
   // output stream fds). In that case owner of the callback may be gone so we
   // don't want to send it anything. |callback_set_| is reset when this gets
   // closed.
   if (callback_set_)
     callback_.Run(type, output);
 }
 
 bool ProcessProxy::StopWatching() {
-   if (!watcher_started_)
-     return true;
+  if (!watcher_started_)
+    return true;
   // Signal Watcher that we are done. We use self-pipe trick to unblock watcher.
   // Anything may be written to the pipe.
   const char message[] = "q";
   return file_util::WriteFileDescriptor(shutdown_pipe_[PIPE_END_WRITE],
                                         message, sizeof(message));
 }
 
 void ProcessProxy::Close() {
   if (!process_launched_)
     return;
@@ skipping 65 matching lines @@
 
   if (pt_pair_[PT_SLAVE_FD] == -1) {
     CloseFdPair(pt_pair);
     return false;
   }
 
   return true;
 }
 
 bool ProcessProxy::LaunchProcess(const std::string& command, int slave_fd,
-                                 pid_t *pid) {
+                                 pid_t* pid) {
   // Redirect crosh  process' output and input so we can read it.
-  base::file_handle_mapping_vector fds_mapping;
+  base::FileHandleMappingVector fds_mapping;
   fds_mapping.push_back(std::make_pair(slave_fd, STDIN_FILENO));
   fds_mapping.push_back(std::make_pair(slave_fd, STDOUT_FILENO));
   fds_mapping.push_back(std::make_pair(slave_fd, STDERR_FILENO));
   base::LaunchOptions options;
   options.fds_to_remap = &fds_mapping;
   options.ctrl_terminal_fd = slave_fd;
 
   // Launch the process.
   return base::LaunchProcess(CommandLine(FilePath(command)), options, pid);
 }
@@ skipping 18 matching lines @@
 
 void ProcessProxy::ClearAllFdPairs() {
   ClearFdPair(pt_pair_);
   ClearFdPair(shutdown_pipe_);
 }
 
 void ProcessProxy::ClearFdPair(int* pipe) {
   pipe[PIPE_END_READ] = kInvalidFd;
   pipe[PIPE_END_WRITE] = kInvalidFd;
 }