summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
Diffstat (limited to 'content')
-rw-r--r--content/browser/browser_child_process_host_impl.cc2
-rw-r--r--content/browser/browser_child_process_host_impl.h2
-rw-r--r--content/browser/child_process_launcher.cc8
-rw-r--r--content/browser/child_process_launcher.h2
-rw-r--r--content/browser/gpu/gpu_process_host.cc2
-rw-r--r--content/browser/plugin_process_host.cc5
-rw-r--r--content/browser/ppapi_plugin_process_host.cc2
-rw-r--r--content/browser/renderer_host/render_process_host_impl.cc2
-rw-r--r--content/browser/utility_process_host_impl.cc2
-rw-r--r--content/browser/utility_process_host_impl.h5
-rw-r--r--content/browser/worker_host/worker_process_host.cc2
-rw-r--r--content/public/browser/browser_child_process_host.h4
-rw-r--r--content/public/browser/utility_process_host.h3
13 files changed, 21 insertions, 20 deletions
diff --git a/content/browser/browser_child_process_host_impl.cc b/content/browser/browser_child_process_host_impl.cc
index 172674e..f4598be 100644
--- a/content/browser/browser_child_process_host_impl.cc
+++ b/content/browser/browser_child_process_host_impl.cc
@@ -133,7 +133,7 @@ void BrowserChildProcessHostImpl::Launch(
SandboxedProcessLauncherDelegate* delegate,
#elif defined(OS_POSIX)
bool use_zygote,
- const base::EnvironmentVector& environ,
+ const base::EnvironmentMap& environ,
#endif
CommandLine* cmd_line) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
diff --git a/content/browser/browser_child_process_host_impl.h b/content/browser/browser_child_process_host_impl.h
index 866808f..7540209 100644
--- a/content/browser/browser_child_process_host_impl.h
+++ b/content/browser/browser_child_process_host_impl.h
@@ -46,7 +46,7 @@ class CONTENT_EXPORT BrowserChildProcessHostImpl
SandboxedProcessLauncherDelegate* delegate,
#elif defined(OS_POSIX)
bool use_zygote,
- const base::EnvironmentVector& environ,
+ const base::EnvironmentMap& environ,
#endif
CommandLine* cmd_line) OVERRIDE;
virtual const ChildProcessData& GetData() const OVERRIDE;
diff --git a/content/browser/child_process_launcher.cc b/content/browser/child_process_launcher.cc
index b5bb3f4..a7927b3 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,
diff --git a/content/browser/child_process_launcher.h b/content/browser/child_process_launcher.h
index fdbb58c..7ce7805 100644
--- a/content/browser/child_process_launcher.h
+++ b/content/browser/child_process_launcher.h
@@ -41,7 +41,7 @@ class CONTENT_EXPORT ChildProcessLauncher {
SandboxedProcessLauncherDelegate* delegate,
#elif defined(OS_POSIX)
bool use_zygote,
- const base::EnvironmentVector& environ,
+ const base::EnvironmentMap& environ,
int ipcfd,
#endif
CommandLine* cmd_line,
diff --git a/content/browser/gpu/gpu_process_host.cc b/content/browser/gpu/gpu_process_host.cc
index c694cdc..cc1e0ba 100644
--- a/content/browser/gpu/gpu_process_host.cc
+++ b/content/browser/gpu/gpu_process_host.cc
@@ -1163,7 +1163,7 @@ bool GpuProcessHost::LaunchGpuProcess(const std::string& channel_id) {
new GpuSandboxedProcessLauncherDelegate(cmd_line),
#elif defined(OS_POSIX)
false,
- base::EnvironmentVector(),
+ base::EnvironmentMap(),
#endif
cmd_line);
process_launched_ = true;
diff --git a/content/browser/plugin_process_host.cc b/content/browser/plugin_process_host.cc
index bffd16e..0e7dffb 100644
--- a/content/browser/plugin_process_host.cc
+++ b/content/browser/plugin_process_host.cc
@@ -220,7 +220,7 @@ bool PluginProcessHost::Init(const WebPluginInfo& info) {
cmd_line->AppendSwitchASCII(switches::kProcessChannelID, channel_id);
#if defined(OS_POSIX)
- base::EnvironmentVector env;
+ base::EnvironmentMap env;
#if defined(OS_MACOSX) && !defined(__LP64__)
if (!browser_command_line.HasSwitch(switches::kDisableCarbonInterposing)) {
std::string interpose_list = GetContentClient()->GetCarbonInterposePath();
@@ -233,8 +233,7 @@ bool PluginProcessHost::Init(const WebPluginInfo& info) {
interpose_list.insert(0, existing_list);
}
}
- env.push_back(std::pair<std::string, std::string>(
- kDYLDInsertLibrariesKey, interpose_list));
+ env[kDYLDInsertLibrariesKey] = interpose_list;
}
#endif
#endif
diff --git a/content/browser/ppapi_plugin_process_host.cc b/content/browser/ppapi_plugin_process_host.cc
index 30dd182..b85950a 100644
--- a/content/browser/ppapi_plugin_process_host.cc
+++ b/content/browser/ppapi_plugin_process_host.cc
@@ -328,7 +328,7 @@ bool PpapiPluginProcessHost::Init(const PepperPluginInfo& info) {
new PpapiPluginSandboxedProcessLauncherDelegate(is_broker_),
#elif defined(OS_POSIX)
use_zygote,
- base::EnvironmentVector(),
+ base::EnvironmentMap(),
#endif
cmd_line);
return true;
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
index 53b2e91..05165c9 100644
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -511,7 +511,7 @@ bool RenderProcessHostImpl::Init() {
new RendererSandboxedProcessLauncherDelegate,
#elif defined(OS_POSIX)
renderer_prefix.empty(),
- base::EnvironmentVector(),
+ base::EnvironmentMap(),
channel_->TakeClientFileDescriptor(),
#endif
cmd_line,
diff --git a/content/browser/utility_process_host_impl.cc b/content/browser/utility_process_host_impl.cc
index 766b82e..9dea2bc 100644
--- a/content/browser/utility_process_host_impl.cc
+++ b/content/browser/utility_process_host_impl.cc
@@ -130,7 +130,7 @@ const ChildProcessData& UtilityProcessHostImpl::GetData() {
#if defined(OS_POSIX)
-void UtilityProcessHostImpl::SetEnv(const base::EnvironmentVector& env) {
+void UtilityProcessHostImpl::SetEnv(const base::EnvironmentMap& env) {
env_ = env;
}
diff --git a/content/browser/utility_process_host_impl.h b/content/browser/utility_process_host_impl.h
index 5443e09..039e20f 100644
--- a/content/browser/utility_process_host_impl.h
+++ b/content/browser/utility_process_host_impl.h
@@ -10,6 +10,7 @@
#include "base/basictypes.h"
#include "base/compiler_specific.h"
+#include "base/files/file_path.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
@@ -42,7 +43,7 @@ class CONTENT_EXPORT UtilityProcessHostImpl
virtual void EnableZygote() OVERRIDE;
virtual const ChildProcessData& GetData() OVERRIDE;
#if defined(OS_POSIX)
- virtual void SetEnv(const base::EnvironmentVector& env) OVERRIDE;
+ virtual void SetEnv(const base::EnvironmentMap& env) OVERRIDE;
#endif
void set_child_flags(int flags) { child_flags_ = flags; }
@@ -77,7 +78,7 @@ class CONTENT_EXPORT UtilityProcessHostImpl
// Launch the utility process from the zygote. Defaults to false.
bool use_linux_zygote_;
- base::EnvironmentVector env_;
+ base::EnvironmentMap env_;
bool started_;
diff --git a/content/browser/worker_host/worker_process_host.cc b/content/browser/worker_host/worker_process_host.cc
index fa37574..c537447 100644
--- a/content/browser/worker_host/worker_process_host.cc
+++ b/content/browser/worker_host/worker_process_host.cc
@@ -215,7 +215,7 @@ bool WorkerProcessHost::Init(int render_process_id) {
new WorkerSandboxedProcessLauncherDelegate,
#elif defined(OS_POSIX)
use_zygote,
- base::EnvironmentVector(),
+ base::EnvironmentMap(),
#endif
cmd_line);
diff --git a/content/public/browser/browser_child_process_host.h b/content/public/browser/browser_child_process_host.h
index 977b1b4..e618ad7 100644
--- a/content/public/browser/browser_child_process_host.h
+++ b/content/public/browser/browser_child_process_host.h
@@ -5,8 +5,8 @@
#ifndef CONTENT_PUBLIC_BROWSER_BROWSER_CHILD_PROCESS_HOST_H_
#define CONTENT_PUBLIC_BROWSER_BROWSER_CHILD_PROCESS_HOST_H_
+#include "base/environment.h"
#include "base/process/kill.h"
-#include "base/process/launch.h"
#include "base/process/process_handle.h"
#include "base/process/process_metrics.h"
#include "base/strings/string16.h"
@@ -48,7 +48,7 @@ class CONTENT_EXPORT BrowserChildProcessHost : public IPC::Sender {
SandboxedProcessLauncherDelegate* delegate,
#elif defined(OS_POSIX)
bool use_zygote,
- const base::EnvironmentVector& environ,
+ const base::EnvironmentMap& environ,
#endif
CommandLine* cmd_line) = 0;
diff --git a/content/public/browser/utility_process_host.h b/content/public/browser/utility_process_host.h
index d85df1e..2cff030 100644
--- a/content/public/browser/utility_process_host.h
+++ b/content/public/browser/utility_process_host.h
@@ -5,6 +5,7 @@
#ifndef CONTENT_PUBLIC_BROWSER_UTILITY_PROCESS_HOST_H_
#define CONTENT_PUBLIC_BROWSER_UTILITY_PROCESS_HOST_H_
+#include "base/environment.h"
#include "base/process/launch.h"
#include "base/threading/thread.h"
#include "content/common/content_export.h"
@@ -68,7 +69,7 @@ class UtilityProcessHost : public IPC::Sender,
virtual const ChildProcessData& GetData() = 0;
#if defined(OS_POSIX)
- virtual void SetEnv(const base::EnvironmentVector& env) = 0;
+ virtual void SetEnv(const base::EnvironmentMap& env) = 0;
#endif
CONTENT_EXPORT static void RegisterUtilityMainThreadFactory(
generated by cgit v1.1 at 2025-03-16 00:01:32 +0000