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 fbde8b8ae24913da6cea6c82d7339e3ceff3c3b9..08c71700201b604e61ccfc4b5deebd1184ef6de2 100644
--- a/content/browser/browser_main_runner.cc
+++ b/content/browser/browser_main_runner.cc
@@ -22,6 +22,10 @@
 #include "base/win/scoped_com_initializer.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 {
@@ -83,6 +87,13 @@ class BrowserMainRunnerImpl : public content::BrowserMainRunner {
     com_initializer_.reset(new base::win::ScopedCOMInitializer);
 #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)