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

base/process/launch.h

 // Copyright (c) 2013 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.
 
 // This file contains functions for launching subprocesses.
 
 #ifndef BASE_PROCESS_LAUNCH_H_
 #define BASE_PROCESS_LAUNCH_H_
 
 #include <set>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/base_export.h"
 #include "base/basictypes.h"
+#include "base/environment.h"
 #include "base/process/process_handle.h"
 
 #if defined(OS_POSIX)
 #include "base/posix/file_descriptor_shuffle.h"
 #elif defined(OS_WIN)
 #include <windows.h>
 #endif
 
 class CommandLine;
 
 namespace base {
 
-typedef std::vector<std::pair<std::string, std::string> > EnvironmentVector;
 typedef std::vector<std::pair<int, int> > FileHandleMappingVector;
 
 // Options for launching a subprocess that are passed to LaunchProcess().
 // The default constructor constructs the object with default options.
-struct LaunchOptions {
-  LaunchOptions()
-      : wait(false),
-#if defined(OS_WIN)
-        start_hidden(false),
-        inherit_handles(false),
-        as_user(NULL),
-        empty_desktop_name(false),
-        job_handle(NULL),
-        stdin_handle(NULL),
-        stdout_handle(NULL),
-        stderr_handle(NULL),
-        force_breakaway_from_job_(false)
-#else
-        environ(NULL),
-        fds_to_remap(NULL),
-        maximize_rlimits(NULL),
-        new_process_group(false)
-#if defined(OS_LINUX)
-        , clone_flags(0)
-#endif  // OS_LINUX
-#if defined(OS_CHROMEOS)
-        , ctrl_terminal_fd(-1)
-#endif  // OS_CHROMEOS
-#endif  // !defined(OS_WIN)
-        {}
+struct BASE_EXPORT LaunchOptions {
+  LaunchOptions();
+  ~LaunchOptions();
 
   // If true, wait for the process to complete.
   bool wait;
 
 #if defined(OS_WIN)
   bool start_hidden;
 
   // If true, the new process inherits handles from the parent. In production
   // code this flag should be used only when running short-lived, trusted
   // binaries, because open handles from other libraries and subsystems will
@@ skipping 23 matching lines @@
   // |inherit_handles| flag must be set to true when redirecting stdio stream.
   HANDLE stdin_handle;
   HANDLE stdout_handle;
   HANDLE stderr_handle;
 
   // If set to true, ensures that the child process is launched with the
   // CREATE_BREAKAWAY_FROM_JOB flag which allows it to breakout of the parent
   // job if any.
   bool force_breakaway_from_job_;
 #else
-  // If non-NULL, set/unset environment variables.
-  // See documentation of AlterEnvironment().
-  // This pointer is owned by the caller and must live through the
-  // call to LaunchProcess().
-  const EnvironmentVector* environ;
+  // Set/unset environment variables. Empty (the default) means to inherit
+  // the same environment. See AlterEnvironment().
+  EnvironmentMap environ;
 
   // If non-NULL, remap file descriptors according to the mapping of
   // src fd->dest fd to propagate FDs into the child process.
   // This pointer is owned by the caller and must live through the
   // call to LaunchProcess().
   const FileHandleMappingVector* fds_to_remap;
 
   // Each element is an RLIMIT_* constant that should be raised to its
   // rlim_max.  This pointer is owned by the caller and must live through
   // the call to LaunchProcess().
@@ skipping 57 matching lines @@
 
 #elif defined(OS_POSIX)
 // A POSIX-specific version of LaunchProcess that takes an argv array
 // instead of a CommandLine.  Useful for situations where you need to
 // control the command line arguments directly, but prefer the
 // CommandLine version if launching Chrome itself.
 BASE_EXPORT bool LaunchProcess(const std::vector<std::string>& argv,
                                const LaunchOptions& options,
                                ProcessHandle* process_handle);
 
-// AlterEnvironment returns a modified environment vector, constructed from the
-// given environment and the list of changes given in |changes|. Each key in
-// the environment is matched against the first element of the pairs. In the
-// event of a match, the value is replaced by the second of the pair, unless
-// the second is empty, in which case the key-value is removed.
-//
-// The returned array is allocated using new[] and must be freed by the caller.
-BASE_EXPORT char** AlterEnvironment(const EnvironmentVector& changes,
-                                    const char* const* const env);
-
 // Close all file descriptors, except those which are a destination in the
 // given multimap. Only call this function in a child process where you know
 // that there aren't any other threads.
 BASE_EXPORT void CloseSuperfluousFds(const InjectiveMultimap& saved_map);
 #endif  // defined(OS_POSIX)
 
 #if defined(OS_WIN)
 // Set JOBOBJECT_EXTENDED_LIMIT_INFORMATION to JobObject |job_object|.
 // As its limit_info.BasicLimitInformation.LimitFlags has
 // JOB_OBJECT_LIMIT_KILL_ON_JOB_CLOSE.
@@ skipping 44 matching lines @@
 // instance running inside the parent.  The parent's Breakpad instance should
 // not handle the child's exceptions.  Calling RestoreDefaultExceptionHandler
 // in the child after forking will restore the standard exception handler.
 // See http://crbug.com/20371/ for more details.
 void RestoreDefaultExceptionHandler();
 #endif  // defined(OS_MACOSX)
 
 }  // namespace base
 
 #endif  // BASE_PROCESS_LAUNCH_H_