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

content/content_renderer.gypi

Index: content/content_renderer.gypi
diff --git a/content/content_renderer.gypi b/content/content_renderer.gypi
index c8e52fd8449095aa7e56e9aec3f1351706c74b19..0cea107e9dfe5c15703c5dd6c24065980a71ed7b 100644
--- a/content/content_renderer.gypi
+++ b/content/content_renderer.gypi
@@ -143,6 +143,22 @@
     'renderer/java/java_bridge_dispatcher.h',
     'renderer/load_progress_tracker.cc',
     'renderer/load_progress_tracker.h',
+    'renderer/media/android/audio_decoder_android.cc',
+    'renderer/media/android/audio_decoder_android.h',
+    'renderer/media/android/media_info_loader.cc',
+    'renderer/media/android/media_info_loader.h',
+    'renderer/media/android/media_source_delegate.cc',
+    'renderer/media/android/media_source_delegate.h',
+    'renderer/media/android/proxy_media_keys.cc',
+    'renderer/media/android/proxy_media_keys.h',
+    'renderer/media/android/stream_texture_factory_android.cc',
+    'renderer/media/android/stream_texture_factory_android.h',
+    'renderer/media/android/webmediaplayer_android.cc',
+    'renderer/media/android/webmediaplayer_android.h',
+    'renderer/media/android/webmediaplayer_manager_android.cc',
+    'renderer/media/android/webmediaplayer_manager_android.h',
+    'renderer/media/android/webmediaplayer_proxy_android.cc',
+    'renderer/media/android/webmediaplayer_proxy_android.h',
     'renderer/media/audio_device_factory.cc',
     'renderer/media/audio_device_factory.h',
     'renderer/media/audio_input_message_filter.cc',
@@ -166,8 +182,6 @@
     'renderer/media/renderer_webaudiodevice_impl.h',
     'renderer/media/rtc_video_renderer.cc',
     'renderer/media/rtc_video_renderer.h',
-    'renderer/media/stream_texture_factory_impl_android.cc',
-    'renderer/media/stream_texture_factory_impl_android.h',
     'renderer/media/video_capture_impl.cc',
     'renderer/media/video_capture_impl.h',
     'renderer/media/video_capture_impl_manager.cc',
@@ -176,8 +190,6 @@
     'renderer/media/video_capture_message_filter.h',
     'renderer/media/webcontentdecryptionmodule_impl.cc',
     'renderer/media/webcontentdecryptionmodule_impl.h',
-    'renderer/media/webmediaplayer_proxy_impl_android.cc',
-    'renderer/media/webmediaplayer_proxy_impl_android.h',
     'renderer/memory_benchmarking_extension.cc',
     'renderer/memory_benchmarking_extension.h',
     'renderer/mhtml_generator.cc',