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 d8c2089c10719ecc97208ffefee07ea39541615e..b5e1498cc57d08e932cd60d437280db14220dc03 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,6 +168,7 @@ struct FileChooserParams;
 struct RenderViewImplParams;
 
 #if defined(OS_ANDROID)
+class WebMediaPlayerManagerAndroid;
 class WebMediaPlayerProxyImplAndroid;
 #endif
 
@@ -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
@@ -1459,7 +1454,7 @@ class CONTENT_EXPORT RenderViewImpl
   WebMediaPlayerProxyImplAndroid* 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_;