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

content/browser/child_process_launcher.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 "content/browser/child_process_launcher.h"
 
 #include <utility>  // For std::pair.
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 56 matching lines @@
 #endif
   }
 
   void Launch(
 #if defined(OS_WIN)
       SandboxedProcessLauncherDelegate* delegate,
 #elif defined(OS_ANDROID)
       int ipcfd,
 #elif defined(OS_POSIX)
       bool use_zygote,
-      const base::EnvironmentVector& environ,
+      const base::EnvironmentMap& environ,
       int ipcfd,
 #endif
       CommandLine* cmd_line,
       int child_process_id,
       Client* client) {
     client_ = client;
 
     CHECK(BrowserThread::GetCurrentThreadIdentifier(&client_thread_id_));
 
 #if defined(OS_ANDROID)
@@ skipping 91 matching lines @@
       // |this_object| is NOT thread safe. Only use it to post a task back.
       scoped_refptr<Context> this_object,
       BrowserThread::ID client_thread_id,
       int child_process_id,
 #if defined(OS_WIN)
       SandboxedProcessLauncherDelegate* delegate,
 #elif defined(OS_ANDROID)
       int ipcfd,
 #elif defined(OS_POSIX)
       bool use_zygote,
-      const base::EnvironmentVector& env,
+      const base::EnvironmentMap& env,
       int ipcfd,
 #endif
       CommandLine* cmd_line) {
     scoped_ptr<CommandLine> cmd_line_deleter(cmd_line);
     base::TimeTicks begin_launch_time = base::TimeTicks::Now();
 
 #if defined(OS_WIN)
     scoped_ptr<SandboxedProcessLauncherDelegate> delegate_deleter(delegate);
     base::ProcessHandle handle = StartSandboxedProcess(delegate, cmd_line);
 #elif defined(OS_ANDROID)
@@ skipping 55 matching lines @@
         const int sandbox_fd =
             RenderSandboxHostLinux::GetInstance()->GetRendererSocket();
         fds_to_map.push_back(std::make_pair(
             sandbox_fd,
             kSandboxIPCChannel + base::GlobalDescriptors::kBaseDescriptor));
       }
 #endif  // defined(OS_MACOSX)
 
       // Actually launch the app.
       base::LaunchOptions options;
-      options.environ = &env;
+      options.environ = env;
       options.fds_to_remap = &fds_to_map;
 
 #if defined(OS_MACOSX)
       // Hold the MachBroker lock for the duration of LaunchProcess. The child
       // will send its task port to the parent almost immediately after startup.
       // The Mach message will be delivered to the parent, but updating the
       // record of the launch will wait until after the placeholder PID is
       // inserted below. This ensures that while the child process may send its
       // port to the parent prior to the parent leaving LaunchProcess, the
       // order in which the record in MachBroker is updated is correct.
@@ skipping 131 matching lines @@
   bool zygote_;
 #endif
 };
 
 
 ChildProcessLauncher::ChildProcessLauncher(
 #if defined(OS_WIN)
     SandboxedProcessLauncherDelegate* delegate,
 #elif defined(OS_POSIX)
     bool use_zygote,
-    const base::EnvironmentVector& environ,
+    const base::EnvironmentMap& environ,
     int ipcfd,
 #endif
     CommandLine* cmd_line,
     int child_process_id,
     Client* client) {
   context_ = new Context();
   context_->Launch(
 #if defined(OS_WIN)
       delegate,
 #elif defined(OS_ANDROID)
@@ skipping 65 matching lines @@
           GetHandle(), background));
 }
 
 void ChildProcessLauncher::SetTerminateChildOnShutdown(
   bool terminate_on_shutdown) {
   if (context_.get())
     context_->set_terminate_child_on_shutdown(terminate_on_shutdown);
 }
 
 }  // namespace content