Upstream BrowserChildProcessHostImpl

content/browser/renderer_host/render_process_host_impl.cc

Index: content/browser/renderer_host/render_process_host_impl.cc
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
index 96d6379ea1c7a0f20816fdab90f1694c949077b0..ae28b3677dccbc815f3823fa68554c5cc1b2fd20 100644
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -123,6 +123,10 @@
 #include "content/common/font_cache_dispatcher_win.h"
 #endif
 
+#if defined(OS_ANDROID)

[jam, 2012/10/11 02:09:14]

nit: since this is a platform-independent file, don't wrap it with ifdef for
readability

+#include "content/browser/browser_child_process_host_impl.h"
+#endif
+
 #include "third_party/skia/include/core/SkBitmap.h"
 
 extern bool g_exited_main_message_loop;
@@ -505,6 +509,10 @@ bool RenderProcessHostImpl::Init() {
     AppendRendererCommandLine(cmd_line);
     cmd_line->AppendSwitchASCII(switches::kProcessChannelID, channel_id);
 
+#if defined(OS_ANDROID)
+    BrowserChildProcessHostImpl::AppendCommonChildCommandLine(cmd_line);
+#endif
+
     // Spawn the child process asynchronously to avoid blocking the UI thread.
     // As long as there's no renderer prefix, we can use the zygote process
     // at this stage.