Remove WebMediaPlayerInProcessAndroid

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 44 matching lines @@
 #include "webkit/compositor_bindings/web_layer_tree_view_impl_for_testing.h"
 #include "webkit/fileapi/isolated_context.h"
 #include "webkit/glue/webkit_constants.h"
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/glue/webkitplatformsupport_impl.h"
 #include "webkit/glue/webthread_impl.h"
 #include "webkit/glue/weburlrequest_extradata_impl.h"
 #include "webkit/gpu/test_context_provider_factory.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/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/media_stream_client.h"
 #include "webkit/media/webmediaplayer_impl.h"
 #include "webkit/media/webmediaplayer_ms.h"
 #include "webkit/media/webmediaplayer_params.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"
@@ skipping 96 matching lines @@
     }
     main_message_loop_.reset(new MessageLoopType);
 
     // TestWebKitPlatformSupport must be instantiated after MessageLoopType.
     webkit_platform_support_.reset(
         new TestWebKitPlatformSupport(unit_test_mode,
                                       shadow_platform_delegate));
 
     idb_factory_.reset(new TestWebIDBFactory());
     WebKit::setIDBFactory(idb_factory_.get());
-
-#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 {
     return webkit_platform_support_.get();
   }
 
@@ skipping 13 matching lines @@
   // in SetCurrentDirectoryForFileURL() and GetAbsoluteWebStringFromUTF8Path(),
   // as the directory might not exist on the device because we are using
   // file-over-http bridge.
   void set_mock_current_directory(const base::FilePath& directory) {
     mock_current_directory_ = directory;
   }
 
   base::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_;
   scoped_ptr<TestWebIDBFactory> idb_factory_;
 
 #if defined(OS_ANDROID)
   base::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 167 matching lines @@
   if (media_stream_client && media_stream_client->IsMediaStream(url)) {
     return new webkit_media::WebMediaPlayerMS(
         frame,
         client,
         base::WeakPtr<webkit_media::WebMediaPlayerDelegate>(),
         media_stream_client,
         new media::MediaLog());
   }
 
 #if defined(OS_ANDROID)
-  return new webkit_media::WebMediaPlayerInProcessAndroid(
-      frame,
-      client,
-      GetWebKitPlatformSupport()->cookieJar(),
-      test_environment->media_player_manager(),
-      test_environment->media_bridge_manager(),
-      new webkit_support::TestStreamTextureFactory(),
-      true);
+  return NULL;
 #else
   webkit_media::WebMediaPlayerParams params(
       NULL, NULL, new media::MediaLog());
   return new webkit_media::WebMediaPlayerImpl(
       frame,
       client,
       base::WeakPtr<webkit_media::WebMediaPlayerDelegate>(),
       params);
 #endif
 }
 
 WebKit::WebMediaPlayer* CreateMediaPlayer(
     WebFrame* frame,
     const WebURL& url,
     WebMediaPlayerClient* client) {
   return CreateMediaPlayer(frame, url, client, NULL);
 }
 
-#if defined(OS_ANDROID)
-void ReleaseMediaResources() {
-  test_environment->media_player_manager()->ReleaseMediaResources();
-}
-#endif
-
 WebKit::WebApplicationCacheHost* CreateApplicationCacheHost(
     WebFrame*, WebKit::WebApplicationCacheHostClient* client) {
   return SimpleAppCacheSystem::CreateApplicationCacheHost(client);
 }
 
 WebKit::WebStorageNamespace* CreateSessionStorageNamespace(unsigned quota) {
   return SimpleDomStorageSystem::instance().CreateSessionStorageNamespace();
 }
 
 WebKit::WebString GetWebKitRootDir() {
@@ skipping 416 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