| Index: content/browser/child_process_launcher.cc
|
| diff --git a/content/browser/child_process_launcher.cc b/content/browser/child_process_launcher.cc
|
| index b5bb3f491f070688914d8f2f8146969509e341db..a7927b3669100cabb04aa72be6cad53abfce7981 100644
|
| --- a/content/browser/child_process_launcher.cc
|
| +++ b/content/browser/child_process_launcher.cc
|
| @@ -74,7 +74,7 @@ class ChildProcessLauncher::Context
|
| int ipcfd,
|
| #elif defined(OS_POSIX)
|
| bool use_zygote,
|
| - const base::EnvironmentVector& environ,
|
| + const base::EnvironmentMap& environ,
|
| int ipcfd,
|
| #endif
|
| CommandLine* cmd_line,
|
| @@ -186,7 +186,7 @@ class ChildProcessLauncher::Context
|
| int ipcfd,
|
| #elif defined(OS_POSIX)
|
| bool use_zygote,
|
| - const base::EnvironmentVector& env,
|
| + const base::EnvironmentMap& env,
|
| int ipcfd,
|
| #endif
|
| CommandLine* cmd_line) {
|
| @@ -262,7 +262,7 @@ class ChildProcessLauncher::Context
|
|
|
| // Actually launch the app.
|
| base::LaunchOptions options;
|
| - options.environ = &env;
|
| + options.environ = env;
|
| options.fds_to_remap = &fds_to_map;
|
|
|
| #if defined(OS_MACOSX)
|
| @@ -414,7 +414,7 @@ ChildProcessLauncher::ChildProcessLauncher(
|
| SandboxedProcessLauncherDelegate* delegate,
|
| #elif defined(OS_POSIX)
|
| bool use_zygote,
|
| - const base::EnvironmentVector& environ,
|
| + const base::EnvironmentMap& environ,
|
| int ipcfd,
|
| #endif
|
| CommandLine* cmd_line,
|
|
|