Move webkit/renderer/media/android/ to content/renderer/media/android/.

webkit/renderer/media/crypto/proxy_decryptor.cc

 // Copyright 2013 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/renderer/media/crypto/proxy_decryptor.h"
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/logging.h"
 #include "media/crypto/aes_decryptor.h"
 #include "webkit/renderer/media/crypto/key_systems.h"
 
 #if defined(ENABLE_PEPPER_CDMS)
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/web/WebFrame.h"
 #include "third_party/WebKit/public/web/WebMediaPlayerClient.h"
 #include "webkit/renderer/media/crypto/ppapi_decryptor.h"
 #include "webkit/plugins/ppapi/ppapi_plugin_instance.h"
 #include "webkit/plugins/ppapi/ppapi_webplugin_impl.h"
 #endif  // defined(ENABLE_PEPPER_CDMS)
 
-#if defined(OS_ANDROID) && !defined(GOOGLE_TV)
-#include "webkit/renderer/media/android/proxy_media_keys.h"
-#include "webkit/renderer/media/android/webmediaplayer_proxy_android.h"
-#endif  // defined(OS_ANDROID) && !defined(GOOGLE_TV)
-
 namespace webkit_media {
 
 #if defined(ENABLE_PEPPER_CDMS)
 // Returns the PluginInstance associated with the Helper Plugin.
 // If a non-NULL pointer is returned, the caller must call closeHelperPlugin()
 // when the Helper Plugin is no longer needed.
 static scoped_refptr<webkit::ppapi::PluginInstance> CreateHelperPlugin(
     const std::string& plugin_type,
     WebKit::WebMediaPlayerClient* web_media_player_client,
     WebKit::WebFrame* web_frame) {
@@ skipping 15 matching lines @@
 void ProxyDecryptor::DestroyHelperPlugin() {
   web_media_player_client_->closeHelperPlugin();
 }
 
 #endif  // defined(ENABLE_PEPPER_CDMS)
 
 ProxyDecryptor::ProxyDecryptor(
 #if defined(ENABLE_PEPPER_CDMS)
     WebKit::WebMediaPlayerClient* web_media_player_client,
     WebKit::WebFrame* web_frame,
-#endif  // defined(ENABLE_PEPPER_CDMS)
-#if defined(OS_ANDROID) && !defined(GOOGLE_TV)
-    WebMediaPlayerProxyAndroid* proxy,
-    int media_keys_id,
-#endif  // defined(OS_ANDROID) && !defined(GOOGLE_TV)
+#elif defined(OS_ANDROID) && !defined(GOOGLE_TV)
+    scoped_ptr<media::MediaKeys> media_keys,
+#endif
     const media::KeyAddedCB& key_added_cb,
     const media::KeyErrorCB& key_error_cb,
     const media::KeyMessageCB& key_message_cb)
     : weak_ptr_factory_(this),
 #if defined(ENABLE_PEPPER_CDMS)
       web_media_player_client_(web_media_player_client),
       web_frame_(web_frame),
-#endif  // defined(ENABLE_PEPPER_CDMS)
-#if defined(OS_ANDROID) && !defined(GOOGLE_TV)
-      proxy_(proxy),
-      media_keys_id_(media_keys_id),
-#endif  // defined(OS_ANDROID) && !defined(GOOGLE_TV)
+#elif defined(OS_ANDROID) && !defined(GOOGLE_TV)
+      media_keys_(media_keys.Pass()),
+#endif
       key_added_cb_(key_added_cb),
       key_error_cb_(key_error_cb),
       key_message_cb_(key_message_cb) {
 }
 
 ProxyDecryptor::~ProxyDecryptor() {
   // Destroy the decryptor explicitly before destroying the plugin.
   {
     base::AutoLock auto_lock(lock_);
     media_keys_.reset();
@@ skipping 106 matching lines @@
     return scoped_ptr<media::MediaKeys>(new media::AesDecryptor(
         base::Bind(&ProxyDecryptor::KeyAdded, weak_ptr_factory_.GetWeakPtr()),
         base::Bind(&ProxyDecryptor::KeyError, weak_ptr_factory_.GetWeakPtr()),
         base::Bind(&ProxyDecryptor::KeyMessage, weak_ptr_factory_.GetWeakPtr())
         ));
   }
 
 #if defined(ENABLE_PEPPER_CDMS)
   return CreatePpapiDecryptor(key_system);
 #elif defined(OS_ANDROID) && !defined(GOOGLE_TV)
-  return scoped_ptr<media::MediaKeys>(
-      new ProxyMediaKeys(proxy_, media_keys_id_));
+  return media_keys_.Pass();
 #else
   return scoped_ptr<media::MediaKeys>();
 #endif
 }
 
 void ProxyDecryptor::KeyAdded(const std::string& session_id) {
   key_added_cb_.Run(session_id);
 }
 
 void ProxyDecryptor::KeyError(const std::string& session_id,
                               media::MediaKeys::KeyError error_code,
                               int system_code) {
   key_error_cb_.Run(session_id, error_code, system_code);
 }
 
 void ProxyDecryptor::KeyMessage(const std::string& session_id,
                                 const std::string& message,
                                 const std::string& default_url) {
   key_message_cb_.Run(session_id, message, default_url);
 }
 
 }  // namespace webkit_media