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

content/renderer/render_view_impl.h

Index: content/renderer/render_view_impl.h
diff --git a/content/renderer/render_view_impl.h b/content/renderer/render_view_impl.h
index b10b8bebc63510b64cb5492afae2fbb1657abfe9..ea98760123955fb0b3a61d666bb6937f9cd8a9a4 100644
--- a/content/renderer/render_view_impl.h
+++ b/content/renderer/render_view_impl.h
@@ -94,12 +94,6 @@ class PluginInstance;
 
 }  // namespace webkit
 
-#if defined(OS_ANDROID)
-namespace webkit_media {
-class WebMediaPlayerManagerAndroid;
-}
-#endif
-
 namespace WebKit {
 class WebApplicationCacheHost;
 class WebApplicationCacheHostClient;
@@ -174,7 +168,8 @@ struct FileChooserParams;
 struct RenderViewImplParams;
 
 #if defined(OS_ANDROID)
-class WebMediaPlayerProxyImplAndroid;
+class WebMediaPlayerManagerAndroid;
+class WebMediaPlayerProxyAndroid;
 #endif
 
 // We need to prevent a page from trying to create infinite popups. It is not
@@ -259,7 +254,7 @@ class CONTENT_EXPORT RenderViewImpl
   }
 
 #if defined(OS_ANDROID)
-  webkit_media::WebMediaPlayerManagerAndroid* media_player_manager() {
+  WebMediaPlayerManagerAndroid* media_player_manager() {
     return media_player_manager_.get();
   }
 #endif
@@ -1460,10 +1455,10 @@ class CONTENT_EXPORT RenderViewImpl
 
   // Proxy class for WebMediaPlayer to communicate with the real media player
   // objects in browser process.
-  WebMediaPlayerProxyImplAndroid* media_player_proxy_;
+  WebMediaPlayerProxyAndroid* media_player_proxy_;
 
   // The media player manager for managing all the media players on this view.
-  scoped_ptr<webkit_media::WebMediaPlayerManagerAndroid> media_player_manager_;
+  scoped_ptr<WebMediaPlayerManagerAndroid> media_player_manager_;
 
   // A date/time picker object for date and time related input elements.
   scoped_ptr<RendererDateTimePicker> date_time_picker_client_;