Upstream BrowserChildProcessHostImpl

content/browser/ppapi_plugin_process_host.cc

Index: content/browser/ppapi_plugin_process_host.cc
diff --git a/content/browser/ppapi_plugin_process_host.cc b/content/browser/ppapi_plugin_process_host.cc
index 4669da0cc61b4d25e69b404b58a008af01c233bb..a94421579be5785e68f2a2278c83361fc7bbc927 100644
--- a/content/browser/ppapi_plugin_process_host.cc
+++ b/content/browser/ppapi_plugin_process_host.cc
@@ -242,7 +242,7 @@ bool PpapiPluginProcessHost::Init(const content::PepperPluginInfo& info) {
 #endif
       switches::kNoSandbox,
       switches::kPpapiFlashArgs,
-      switches::kPpapiStartupDialog,
+      switches::kPpapiStartupDialog
     };
     cmd_line->CopySwitchesFrom(browser_command_line, kPluginForwardSwitches,
                                arraysize(kPluginForwardSwitches));
@@ -258,6 +258,15 @@ bool PpapiPluginProcessHost::Init(const content::PepperPluginInfo& info) {
   if (!plugin_launcher.empty())
     cmd_line->PrependWrapper(plugin_launcher);
 
+  base::EnvironmentVector env;

[Yaron, 2012/10/09 21:38:53]

I think we can just drop this. We don't use plugin proceses.

[Yusuf, 2012/10/10 00:06:08]

Done.

+#if defined(OS_ANDROID)
+  BrowserChildProcessHostImpl::AppendCommonChildCommandLine(cmd_line);
+  if (CommandLine::ForCurrentProcess()->HasSwitch(
+      switches::kPpapiStartupDialog)) {
+    cmd_line->AppendSwitch(switches::kPpapiStartupDialog);
+  }
+#endif
+
   // On posix, never use the zygote for the broker. Also, only use the zygote if
   // the plugin is sandboxed, and we are not using a plugin launcher - having a
   // plugin launcher means we need to use another process instead of just