Move AlterEnvironment to base/environment.h, implement on Windows.

base/process/process_util_unittest.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.
 
 #define _CRT_SECURE_NO_WARNINGS
 
 #include <limits>
 
 #include "base/command_line.h"
 #include "base/debug/alias.h"
@@ skipping 577 matching lines @@
   ret = HANDLE_EINTR(close(sockets[0]));
   DPCHECK(ret == 0);
   ret = HANDLE_EINTR(close(sockets[1]));
   DPCHECK(ret == 0);
   ret = HANDLE_EINTR(close(dev_null));
   DPCHECK(ret == 0);
 }
 
 namespace {
 
-std::string TestLaunchProcess(const base::EnvironmentVector& env_changes,
+std::string TestLaunchProcess(const base::EnvironmentMap& env_changes,
                               const int clone_flags) {
   std::vector<std::string> args;
   base::FileHandleMappingVector fds_to_remap;
 
   args.push_back(kPosixShell);
   args.push_back("-c");
   args.push_back("echo $BASE_TEST");
 
   int fds[2];
   PCHECK(pipe(fds) == 0);
 
   fds_to_remap.push_back(std::make_pair(fds[1], 1));
   base::LaunchOptions options;
   options.wait = true;
-  options.environ = &env_changes;
+  options.environ = env_changes;
   options.fds_to_remap = &fds_to_remap;
 #if defined(OS_LINUX)
   options.clone_flags = clone_flags;
 #else
   CHECK_EQ(0, clone_flags);
 #endif  // OS_LINUX
   EXPECT_TRUE(base::LaunchProcess(args, options, NULL));
   PCHECK(HANDLE_EINTR(close(fds[1])) == 0);
 
   char buf[512];
@@ skipping 10 matching lines @@
     "0123456789012345678901234567890123456789012345678901234567890123456789"
     "0123456789012345678901234567890123456789012345678901234567890123456789"
     "0123456789012345678901234567890123456789012345678901234567890123456789"
     "0123456789012345678901234567890123456789012345678901234567890123456789"
     "0123456789012345678901234567890123456789012345678901234567890123456789"
     "0123456789012345678901234567890123456789012345678901234567890123456789";
 
 }  // namespace
 
 TEST_F(ProcessUtilTest, LaunchProcess) {
-  base::EnvironmentVector env_changes;
+  base::EnvironmentMap env_changes;
   const int no_clone_flags = 0;
 
-  env_changes.push_back(std::make_pair(std::string("BASE_TEST"),
-                                       std::string("bar")));
+  const char kBaseTest[] = "BASE_TEST";
+
+  env_changes[kBaseTest] = "bar";
   EXPECT_EQ("bar\n", TestLaunchProcess(env_changes, no_clone_flags));
   env_changes.clear();
 
-  EXPECT_EQ(0, setenv("BASE_TEST", "testing", 1 /* override */));
+  EXPECT_EQ(0, setenv(kBaseTest, "testing", 1 /* override */));
   EXPECT_EQ("testing\n", TestLaunchProcess(env_changes, no_clone_flags));
 
-  env_changes.push_back(
-      std::make_pair(std::string("BASE_TEST"), std::string()));
+  env_changes[kBaseTest] = std::string();
   EXPECT_EQ("\n", TestLaunchProcess(env_changes, no_clone_flags));
 
-  env_changes[0].second = "foo";
+  env_changes[kBaseTest] = "foo";
   EXPECT_EQ("foo\n", TestLaunchProcess(env_changes, no_clone_flags));
 
   env_changes.clear();
-  EXPECT_EQ(0, setenv("BASE_TEST", kLargeString, 1 /* override */));
+  EXPECT_EQ(0, setenv(kBaseTest, kLargeString, 1 /* override */));
   EXPECT_EQ(std::string(kLargeString) + "\n",
             TestLaunchProcess(env_changes, no_clone_flags));
 
-  env_changes.push_back(std::make_pair(std::string("BASE_TEST"),
-                                       std::string("wibble")));
+  env_changes[kBaseTest] = "wibble";
   EXPECT_EQ("wibble\n", TestLaunchProcess(env_changes, no_clone_flags));
 
 #if defined(OS_LINUX)
   // Test a non-trival value for clone_flags.
   // Don't test on Valgrind as it has limited support for clone().
   if (!RunningOnValgrind()) {
     EXPECT_EQ("wibble\n", TestLaunchProcess(env_changes, CLONE_FS | SIGCHLD));
   }
 #endif
 }
 
-TEST_F(ProcessUtilTest, AlterEnvironment) {
-  const char* const empty[] = { NULL };
-  const char* const a2[] = { "A=2", NULL };
-  base::EnvironmentVector changes;
-  char** e;
-
-  e = base::AlterEnvironment(changes, empty);
-  EXPECT_TRUE(e[0] == NULL);
-  delete[] e;
-
-  changes.push_back(std::make_pair(std::string("A"), std::string("1")));
-  e = base::AlterEnvironment(changes, empty);
-  EXPECT_EQ(std::string("A=1"), e[0]);
-  EXPECT_TRUE(e[1] == NULL);
-  delete[] e;
-
-  changes.clear();
-  changes.push_back(std::make_pair(std::string("A"), std::string()));
-  e = base::AlterEnvironment(changes, empty);
-  EXPECT_TRUE(e[0] == NULL);
-  delete[] e;
-
-  changes.clear();
-  e = base::AlterEnvironment(changes, a2);
-  EXPECT_EQ(std::string("A=2"), e[0]);
-  EXPECT_TRUE(e[1] == NULL);
-  delete[] e;
-
-  changes.clear();
-  changes.push_back(std::make_pair(std::string("A"), std::string("1")));
-  e = base::AlterEnvironment(changes, a2);
-  EXPECT_EQ(std::string("A=1"), e[0]);
-  EXPECT_TRUE(e[1] == NULL);
-  delete[] e;
-
-  changes.clear();
-  changes.push_back(std::make_pair(std::string("A"), std::string()));
-  e = base::AlterEnvironment(changes, a2);
-  EXPECT_TRUE(e[0] == NULL);
-  delete[] e;
-}
-
 TEST_F(ProcessUtilTest, GetAppOutput) {
   std::string output;
 
 #if defined(OS_ANDROID)
   std::vector<std::string> argv;
   argv.push_back("sh");  // Instead of /bin/sh, force path search to find it.
   argv.push_back("-c");
 
   argv.push_back("exit 0");
   EXPECT_TRUE(base::GetAppOutput(CommandLine(argv), &output));
@@ skipping 220 matching lines @@
   // Check that process was really killed.
   EXPECT_TRUE(IsProcessDead(child_process));
   base::CloseProcessHandle(child_process);
 }
 
 MULTIPROCESS_TEST_MAIN(process_util_test_die_immediately) {
   return 0;
 }
 
 #endif  // defined(OS_POSIX)