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

base/process_util_posix.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 <dirent.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <signal.h>
 #include <stdlib.h>
 #include <sys/resource.h>
@@ skipping 397 matching lines @@
     // own use and will complain if we try to close them.  All of
     // these FDs are >= |max_fds|, so we can check against that here
     // before closing.  See https://bugs.kde.org/show_bug.cgi?id=191758
     if (fd < static_cast<int>(max_fds)) {
       int ret = HANDLE_EINTR(close(fd));
       DPCHECK(ret == 0);
     }
   }
 }
 
-char** AlterEnvironment(const environment_vector& changes,
+char** AlterEnvironment(const EnvironmentVector& changes,
                         const char* const* const env) {
   unsigned count = 0;
   unsigned size = 0;
 
   // First assume that all of the current environment will be included.
   for (unsigned i = 0; env[i]; i++) {
     const char *const pair = env[i];
     count++;
     size += strlen(pair) + 1 /* terminating NUL */;
   }
 
-  for (environment_vector::const_iterator
-       j = changes.begin(); j != changes.end(); j++) {
+  for (EnvironmentVector::const_iterator j = changes.begin();
+       j != changes.end();
+       ++j) {
     bool found = false;
     const char *pair;
 
     for (unsigned i = 0; env[i]; i++) {
       pair = env[i];
       const char *const equals = strchr(pair, '=');
       if (!equals)
         continue;
       const unsigned keylen = equals - pair;
       if (keylen == j->first.size() &&
@@ skipping 29 matching lines @@
     const char *const equals = strchr(pair, '=');
     if (!equals) {
       const unsigned len = strlen(pair);
       ret[k++] = scratch;
       memcpy(scratch, pair, len + 1);
       scratch += len + 1;
       continue;
     }
     const unsigned keylen = equals - pair;
     bool handled = false;
-    for (environment_vector::const_iterator
+    for (EnvironmentVector::const_iterator
          j = changes.begin(); j != changes.end(); j++) {
       if (j->first.size() == keylen &&
           memcmp(j->first.data(), pair, keylen) == 0) {
         if (!j->second.empty()) {
           ret[k++] = scratch;
           memcpy(scratch, pair, keylen + 1);
           scratch += keylen + 1;
           memcpy(scratch, j->second.c_str(), j->second.size() + 1);
           scratch += j->second.size() + 1;
         }
         handled = true;
         break;
       }
     }
 
     if (!handled) {
       const unsigned len = strlen(pair);
       ret[k++] = scratch;
       memcpy(scratch, pair, len + 1);
       scratch += len + 1;
     }
   }
 
   // Now handle new elements
-  for (environment_vector::const_iterator
+  for (EnvironmentVector::const_iterator
        j = changes.begin(); j != changes.end(); j++) {
     if (j->second.empty())
       continue;
 
     bool found = false;
     for (unsigned i = 0; env[i]; i++) {
       const char *const pair = env[i];
       const char *const equals = strchr(pair, '=');
       if (!equals)
         continue;
@@ skipping 172 matching lines @@
                 ioctl(options.ctrl_terminal_fd, TIOCSCTTY, NULL)) == -1) {
           RAW_LOG(WARNING, "ioctl(TIOCSCTTY), ctrl terminal not set");
         }
       } else {
         RAW_LOG(WARNING, "setsid failed, ctrl terminal not set");
       }
     }
 #endif  // defined(OS_CHROMEOS)
 
     if (options.fds_to_remap) {
-      for (file_handle_mapping_vector::const_iterator
+      for (FileHandleMappingVector::const_iterator
                it = options.fds_to_remap->begin();
            it != options.fds_to_remap->end(); ++it) {
         fd_shuffle1.push_back(InjectionArc(it->first, it->second, false));
         fd_shuffle2.push_back(InjectionArc(it->first, it->second, false));
       }
     }
 
 #if defined(OS_MACOSX)
     if (options.synchronize) {
       // Remap the read side of the synchronization pipe back onto itself,
@@ skipping 613 matching lines @@
   if (IsChildDead(process))
     return;
 
   BackgroundReaper* reaper = new BackgroundReaper(process, 0);
   PlatformThread::CreateNonJoinable(0, reaper);
 }
 
 #endif  // !defined(OS_MACOSX)
 
 }  // namespace base