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

webkit/renderer/media/crypto/proxy_decryptor.cc

Index: webkit/renderer/media/crypto/proxy_decryptor.cc
diff --git a/webkit/renderer/media/crypto/proxy_decryptor.cc b/webkit/renderer/media/crypto/proxy_decryptor.cc
index 7f6b4cfe6775b6cf4b82945931adabc1fdd9c375..007c6d9acbed3ab4f3059828949ebe63ebad8e25 100644
--- a/webkit/renderer/media/crypto/proxy_decryptor.cc
+++ b/webkit/renderer/media/crypto/proxy_decryptor.cc
@@ -19,11 +19,6 @@
 #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)
@@ -59,11 +54,9 @@ 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)
@@ -71,11 +64,9 @@ ProxyDecryptor::ProxyDecryptor(
 #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) {
@@ -202,8 +193,7 @@ scoped_ptr<media::MediaKeys> ProxyDecryptor::CreateMediaKeys(
 #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