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

chrome/utility/importer/firefox_importer_unittest_utils_mac.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 "chrome/utility/importer/firefox_importer_unittest_utils.h"
 
 #include "base/base_switches.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
@@ skipping 25 matching lines @@
 // |handle| - On return, the process handle to use to communicate with the
 // child.
 bool LaunchNSSDecrypterChildProcess(const base::FilePath& nss_path,
     IPC::Channel* channel, base::ProcessHandle* handle) {
   CommandLine cl(*CommandLine::ForCurrentProcess());
   cl.AppendSwitchASCII(switches::kTestChildProcess, "NSSDecrypterChildProcess");
 
   // Set env variable needed for FF encryption libs to load.
   // See "chrome/utility/importer/nss_decryptor_mac.mm" for an explanation of
   // why we need this.
-  base::EnvironmentVector env;
-  std::pair<std::string, std::string> dyld_override;
-  dyld_override.first = "DYLD_FALLBACK_LIBRARY_PATH";
-  dyld_override.second = nss_path.value();
-  env.push_back(dyld_override);
+  base::LaunchOptions options;
+  options.environ["DYLD_FALLBACK_LIBRARY_PATH"] = nss_path.value();
 
   int ipcfd = channel->TakeClientFileDescriptor();
   if (ipcfd == -1)
     return false;
 
   file_util::ScopedFD client_file_descriptor_closer(&ipcfd);
   base::FileHandleMappingVector fds_to_map;
   fds_to_map.push_back(std::pair<int,int>(ipcfd, kPrimaryIPCChannel + 3));
 
   bool debug_on_start = CommandLine::ForCurrentProcess()->HasSwitch(
                             switches::kDebugChildren);
-  base::LaunchOptions options;
-  options.environ = &env;
   options.fds_to_remap = &fds_to_map;
   options.wait = debug_on_start;
   return base::LaunchProcess(cl.argv(), options, handle);
 }
 
 }  // namespace
 
 //----------------------- Server --------------------
 
 // Class to communicate on the server side of the IPC Channel.
@@ skipping 199 matching lines @@
 
   IPC::Channel channel(kTestChannelID, IPC::Channel::MODE_CLIENT, &listener);
   CHECK(channel.Connect());
   listener.SetSender(&channel);
 
   // run message loop
   base::MessageLoop::current()->Run();
 
   return 0;
 }