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

BUG=none
TEST=none

Review URL: http://codereview.chromium.org/9429039

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@123438 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 7 insertions, 12 deletions

diff --git a/base/test/multiprocess_test.cc b/base/test/multiprocess_test.cc
index 97f335c..b0773ae 100644
--- a/base/test/multiprocess_test.cc
+++ b/base/test/multiprocess_test.cc
@@ -1,4 +1,4 @@
-// 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.
 
@@ -7,11 +7,6 @@
 #include "base/base_switches.h"
 #include "base/command_line.h"
 
-#if defined(OS_POSIX)
-#include <sys/types.h>
-#include <unistd.h>
-#endif
-
 namespace base {
 
 MultiProcessTest::MultiProcessTest() {
@@ -19,14 +14,14 @@ MultiProcessTest::MultiProcessTest() {
 
 ProcessHandle MultiProcessTest::SpawnChild(const std::string& procname,
                                            bool debug_on_start) {
-  file_handle_mapping_vector empty_file_list;
+  FileHandleMappingVector empty_file_list;
   return SpawnChildImpl(procname, empty_file_list, debug_on_start);
 }
 
 #if defined(OS_POSIX)
 ProcessHandle MultiProcessTest::SpawnChild(
     const std::string& procname,
-    const file_handle_mapping_vector& fds_to_map,
+    const FileHandleMappingVector& fds_to_map,
     bool debug_on_start) {
   return SpawnChildImpl(procname, fds_to_map, debug_on_start);
 }
@@ -43,7 +38,7 @@ CommandLine MultiProcessTest::MakeCmdLine(const std::string& procname,
 
 ProcessHandle MultiProcessTest::SpawnChildImpl(
     const std::string& procname,
-    const file_handle_mapping_vector& fds_to_map,
+    const FileHandleMappingVector& fds_to_map,
     bool debug_on_start) {
   ProcessHandle handle = kNullProcessHandle;
   base::LaunchOptions options;
diff --git a/base/test/multiprocess_test.h b/base/test/multiprocess_test.h
index bfb9e2a..88f6b2a 100644
--- a/base/test/multiprocess_test.h
+++ b/base/test/multiprocess_test.h
@@ -1,4 +1,4 @@
-// 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.
 
@@ -62,7 +62,7 @@ class MultiProcessTest : public PlatformTest {
   // SpawnChild() should just take a base::LaunchOptions so that we don't
   // need multiple versions of it.
   ProcessHandle SpawnChild(const std::string& procname,
-                           const file_handle_mapping_vector& fds_to_map,
+                           const FileHandleMappingVector& fds_to_map,
                            bool debug_on_start);
 #endif
 
@@ -75,7 +75,7 @@ class MultiProcessTest : public PlatformTest {
   // TODO: |fds_to_map| is unused on Windows; see above TODO about
   // further refactoring.
   ProcessHandle SpawnChildImpl(const std::string& procname,
-                               const file_handle_mapping_vector& fds_to_map,
+                               const FileHandleMappingVector& fds_to_map,
                                bool debug_on_start);
 
   DISALLOW_COPY_AND_ASSIGN(MultiProcessTest);