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

chrome/app/nacl_fork_delegate_linux.cc

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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/app/nacl_fork_delegate_linux.h"
 
 #include <signal.h>
 #include <stdlib.h>
 #include <sys/resource.h>
 #include <sys/socket.h>
 
+#include <set>
+
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/eintr_wrapper.h"
 #include "base/logging.h"
 #include "base/file_path.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
 #include "base/third_party/dynamic_annotations/dynamic_annotations.h"
 #include "content/common/unix_domain_socket_posix.h"
 #include "chrome/common/chrome_paths.h"
@@ skipping 18 matching lines @@
   VLOG(1) << "NaClForkDelegate::Init()";
   int fds[2];
 
   sandboxed_ = sandboxed;
   // Confirm a couple hard-wired assumptions.
   // The NaCl constants are from chrome/nacl/nacl_linux_helper.h
   DCHECK(kNaClBrowserDescriptor == browserdesc);
   DCHECK(kNaClSandboxDescriptor == sandboxdesc);
 
   CHECK(socketpair(PF_UNIX, SOCK_SEQPACKET, 0, fds) == 0);
-  base::file_handle_mapping_vector fds_to_map;
+  base::FileHandleMappingVector fds_to_map;
   fds_to_map.push_back(std::make_pair(fds[1], kNaClZygoteDescriptor));
   fds_to_map.push_back(std::make_pair(sandboxdesc, kNaClSandboxDescriptor));
 
   status_ = kNaClHelperUnused;
   FilePath helper_exe;
   FilePath helper_bootstrap_exe;
   if (!PathService::Get(chrome::FILE_NACL_HELPER, &helper_exe)) {
     status_ = kNaClHelperMissing;
   } else if (!PathService::Get(chrome::FILE_NACL_HELPER_BOOTSTRAP,
                                &helper_bootstrap_exe)) {
@@ skipping 98 matching lines @@
 
 bool NaClForkDelegate::AckChild(const int fd,
                                 const std::string& channel_switch) {
   int nwritten = HANDLE_EINTR(write(fd, channel_switch.c_str(),
                                     channel_switch.length()));
   if (nwritten != static_cast<int>(channel_switch.length())) {
     return false;
   }
   return true;
 }