Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(279)

Unified Diff: chrome/utility/importer/firefox_importer_unittest_utils_mac.cc

Issue 22750002: Move AlterEnvironment to base/environment.h, implement on Windows. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix win Created 7 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/test/chromedriver/chrome_launcher.cc ('k') | chromeos/process_proxy/process_proxy.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/utility/importer/firefox_importer_unittest_utils_mac.cc
diff --git a/chrome/utility/importer/firefox_importer_unittest_utils_mac.cc b/chrome/utility/importer/firefox_importer_unittest_utils_mac.cc
index 5e8cb9d305d10977150afd37a11d0a03b72df16e..cbbf5a94b265271802bcdd3e04b6550cb45f741c 100644
--- a/chrome/utility/importer/firefox_importer_unittest_utils_mac.cc
+++ b/chrome/utility/importer/firefox_importer_unittest_utils_mac.cc
@@ -43,11 +43,8 @@ bool LaunchNSSDecrypterChildProcess(const base::FilePath& nss_path,
// 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)
@@ -59,8 +56,6 @@ bool LaunchNSSDecrypterChildProcess(const base::FilePath& nss_path,
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);
« no previous file with comments | « chrome/test/chromedriver/chrome_launcher.cc ('k') | chromeos/process_proxy/process_proxy.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698