Move android mediaplayer from render process to browser process.

webkit/support/webkit_support.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 "webkit/support/webkit_support.h"
 
 #include "base/at_exit.h"
 #include "base/base64.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 40 matching lines @@
 #include "webkit/appcache/web_application_cache_host_impl.h"
 #include "webkit/fileapi/isolated_context.h"
 #include "webkit/glue/user_agent.h"
 #include "webkit/glue/webkit_constants.h"
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/glue/webkitplatformsupport_impl.h"
 #include "webkit/glue/weburlrequest_extradata_impl.h"
 #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"
 #include "webkit/plugins/npapi/plugin_list.h"
 #include "webkit/plugins/npapi/webplugin_impl.h"
 #include "webkit/plugins/npapi/webplugin_page_delegate.h"
 #include "webkit/plugins/webplugininfo.h"
 #include "webkit/support/platform_support.h"
 #include "webkit/support/simple_database_system.h"
 #include "webkit/support/test_webkit_platform_support.h"
@@ skipping 87 matching lines @@
       InitLogging();
     }
     main_message_loop_.reset(new MessageLoopType);
 
     // TestWebKitPlatformSupport must be instantiated after MessageLoopType.
     webkit_platform_support_.reset(
         new TestWebKitPlatformSupport(unit_test_mode,
                                       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
   }
 
   ~TestEnvironment() {
     SimpleResourceLoaderBridge::Shutdown();
   }
 
   TestWebKitPlatformSupport* webkit_platform_support() const {
@@ skipping 20 matching lines @@
     mock_current_directory_ = directory;
   }
 
   FilePath mock_current_directory() const {
     return mock_current_directory_;
   }
 
   webkit_media::WebMediaPlayerManagerAndroid* media_player_manager() {
     return media_player_manager_.get();
   }
+
+  webkit_media::MediaPlayerBridgeManagerImpl* media_bridge_manager() {
+    return media_bridge_manager_.get();
+  }
 #endif
 
  private:
   // Data member at_exit_manager_ will take the ownership of the input
   // AtExitManager and manage its lifecycle.
   scoped_ptr<base::AtExitManager> at_exit_manager_;
   scoped_ptr<MessageLoopType> main_message_loop_;
   scoped_ptr<TestWebKitPlatformSupport> webkit_platform_support_;
 
 #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
 };
 
 class WebPluginImplWithPageDelegate
     : public webkit_support::TestWebPluginPageDelegate,
       public base::SupportsWeakPtr<WebPluginImplWithPageDelegate>,
       public webkit::npapi::WebPluginImpl {
  public:
   WebPluginImplWithPageDelegate(WebFrame* frame,
                                 const WebPluginParams& params,
@@ skipping 149 matching lines @@
   return new WebPluginImplWithPageDelegate(
       frame, new_params, plugins.front().path);
 }
 
 WebKit::WebMediaPlayer* CreateMediaPlayer(
     WebFrame* frame,
     const WebURL& url,
     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());
 
   scoped_ptr<media::FilterCollection> collection(
       new media::FilterCollection());
 
   return new webkit_media::WebMediaPlayerImpl(
       frame,
       client,
@@ skipping 435 matching lines @@
 // Logging
 void EnableWebCoreLogChannels(const std::string& channels) {
   webkit_glue::EnableWebCoreLogChannels(channels);
 }
 
 void SetGamepadData(const WebKit::WebGamepads& pads) {
   test_environment->webkit_platform_support()->setGamepadData(pads);
 }
 
 }  // namespace webkit_support