Move android mediaplayer from render process to browser process.

webkit/support/webkit_support.cc

Index: webkit/support/webkit_support.cc
diff --git a/webkit/support/webkit_support.cc b/webkit/support/webkit_support.cc
index de46cb0a5046f9e4efe41658cf892482d3822f3c..435c0f4638991c8b9ecece2cafbca93414cbc034 100644
--- a/webkit/support/webkit_support.cc
+++ b/webkit/support/webkit_support.cc
@@ -57,7 +57,8 @@
 #include "webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h"
 #include "webkit/gpu/webgraphicscontext3d_in_process_impl.h"
 #if defined(OS_ANDROID)
-#include "webkit/media/android/webmediaplayer_android.h"
+#include "webkit/media/android/media_player_bridge_manager_impl.h"
+#include "webkit/media/android/webmediaplayer_in_process_android.h"
 #include "webkit/media/android/webmediaplayer_manager_android.h"
 #endif
 #include "webkit/media/webmediaplayer_impl.h"
@@ -167,6 +168,10 @@ class TestEnvironment {
                                       shadow_platform_delegate));
 
 #if defined(OS_ANDROID)
+    // Make sure we have enough decoding resources for layout tests.
+    // The current maximum number of media elements in a layout test is 8.
+    media_bridge_manager_.reset(
+        new webkit_media::MediaPlayerBridgeManagerImpl(8));
     media_player_manager_.reset(
         new webkit_media::WebMediaPlayerManagerAndroid());
 #endif
@@ -207,6 +212,10 @@ class TestEnvironment {
   webkit_media::WebMediaPlayerManagerAndroid* media_player_manager() {
     return media_player_manager_.get();
   }
+
+  webkit_media::MediaPlayerBridgeManagerImpl* media_bridge_manager() {
+    return media_bridge_manager_.get();
+  }
 #endif
 
  private:
@@ -219,6 +228,7 @@ class TestEnvironment {
 #if defined(OS_ANDROID)
   FilePath mock_current_directory_;
   scoped_ptr<webkit_media::WebMediaPlayerManagerAndroid> media_player_manager_;
+  scoped_ptr<webkit_media::MediaPlayerBridgeManagerImpl> media_bridge_manager_;
 #endif
 };
 
@@ -388,12 +398,14 @@ WebKit::WebMediaPlayer* CreateMediaPlayer(
     WebMediaPlayerClient* client,
     webkit_media::MediaStreamClient* media_stream_client) {
 #if defined(OS_ANDROID)
-  return new webkit_media::WebMediaPlayerAndroid(
+  return new webkit_media::WebMediaPlayerInProcessAndroid(
       frame,
       client,
       GetWebKitPlatformSupport()->cookieJar(),
       test_environment->media_player_manager(),
-      new webkit_support::TestStreamTextureFactory());
+      test_environment->media_bridge_manager(),
+      new webkit_support::TestStreamTextureFactory(),
+      true);
 #else
   scoped_ptr<media::MessageLoopFactory> message_loop_factory(
       new media::MessageLoopFactory());