Move android mediaplayer from render process to browser process.

content/browser/browser_main_runner.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/public/browser/browser_main_runner.h"
 
 #include "base/allocator/allocator_shim.h"
 #include "base/base_switches.h"
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/metrics/statistics_recorder.h"
 #include "content/browser/browser_main_loop.h"
 #include "content/browser/notification_service_impl.h"
 #include "content/common/child_process.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/main_function_params.h"
 
 #if defined(OS_WIN)
 #include "base/win/metro.h"
 #include "base/win/scoped_com_initializer.h"
 #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 {
 
 class BrowserMainRunnerImpl : public content::BrowserMainRunner {
  public:
   BrowserMainRunnerImpl()
       : is_initialized_(false),
         is_shutdown_(false),
         created_threads_(false) {
@@ skipping 51 matching lines @@
     // allocator selection is not supported.
 
     // Make this call before going multithreaded, or spawning any subprocesses.
     base::allocator::SetupSubprocessAllocator();
 #endif
     com_initializer_.reset(new base::win::ScopedCOMInitializer);
     if (base::win::IsTsfAwareRequired())
       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)
       return result_code;
     created_threads_ = true;
 
     // Return -1 to indicate no early termination.
     return -1;
   }
 
@@ skipping 47 matching lines @@
 }  // namespace
 
 namespace content {
 
 // static
 BrowserMainRunner* BrowserMainRunner::Create() {
   return new BrowserMainRunnerImpl();
 }
 
 }  // namespace content