Move android mediaplayer from render process to browser process.

content/browser/browser_main_runner.cc

Index: content/browser/browser_main_runner.cc
diff --git a/content/browser/browser_main_runner.cc b/content/browser/browser_main_runner.cc
index bdb6eff6d21c5c017a5c6658ef2eb05dad5cc227..4333b751faf26f38385d68d9d86cacb28e0f322b 100644
--- a/content/browser/browser_main_runner.cc
+++ b/content/browser/browser_main_runner.cc
@@ -24,6 +24,10 @@
 #include "ui/base/win/tsf_bridge.h"
 #endif
 
+#if defined(OS_ANDROID)
+#include "content/browser/android/surface_texture_peer_browser_impl.h"
+#endif
+
 bool g_exited_main_message_loop = false;
 
 namespace {
@@ -95,6 +99,13 @@ class BrowserMainRunnerImpl : public content::BrowserMainRunner {
       ui::TsfBridge::Initialize();
 #endif  // OS_WIN
 
+#if defined(OS_ANDROID)
+    content::SurfaceTexturePeer::InitInstance(
+        new content::SurfaceTexturePeerBrowserImpl(
+            parameters.command_line.HasSwitch(
+                switches::kMediaPlayerInRenderProcess)));
+#endif
+
     main_loop_->CreateThreads();
     int result_code = main_loop_->GetResultCode();
     if (result_code > 0)