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

content/renderer/media/webmediaplayer_proxy_impl_android.h

Index: content/renderer/media/webmediaplayer_proxy_impl_android.h
diff --git a/content/renderer/media/webmediaplayer_proxy_impl_android.h b/content/renderer/media/webmediaplayer_proxy_impl_android.h
index 0864bf770cfa7dcb47bca7c2fb11aa5bc4943ea1..fcaea5ecca520d1908402c9e65e800e8ee606c54 100644
--- a/content/renderer/media/webmediaplayer_proxy_impl_android.h
+++ b/content/renderer/media/webmediaplayer_proxy_impl_android.h
@@ -8,29 +8,27 @@
 #include <map>
 
 #include "content/public/renderer/render_view_observer.h"
+#include "content/renderer/media/android/webmediaplayer_proxy_android.h"
 #include "media/base/media_keys.h"
-#include "webkit/renderer/media/android/webmediaplayer_proxy_android.h"
 
-namespace webkit_media {
+namespace content {
+
 class WebMediaPlayerAndroid;
 class WebMediaPlayerManagerAndroid;
-}
-
-namespace content {
 
 // This class manages all the IPC communications between
 // WebMediaPlayerAndroid and the MediaPlayerManagerAndroid in the browser
 // process.
 class WebMediaPlayerProxyImplAndroid

[qinmin, 2013/06/21 04:37:05]

same here, rename to WebMediaPlayerProxyAndroid, and no need for inheritance

[scherkus (not reviewing), 2013/06/21 21:37:59]

Done.

     : public RenderViewObserver,
-      public webkit_media::WebMediaPlayerProxyAndroid {
+      public WebMediaPlayerProxyAndroid {
  public:
   // Construct a WebMediaPlayerProxyImplAndroid object for the |render_view|.
   // |manager| is passed to this class so that it can find the right
   // WebMediaPlayerAndroid using player IDs.
   WebMediaPlayerProxyImplAndroid(
       RenderView* render_view,
-      webkit_media::WebMediaPlayerManagerAndroid* manager);
+      WebMediaPlayerManagerAndroid* manager);
   virtual ~WebMediaPlayerProxyImplAndroid();
 
   virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;
@@ -75,7 +73,7 @@ class WebMediaPlayerProxyImplAndroid
 #endif
 
  private:
-  webkit_media::WebMediaPlayerAndroid* GetWebMediaPlayer(int player_id);
+  WebMediaPlayerAndroid* GetWebMediaPlayer(int player_id);
 
   // Message handlers.
   void OnMediaMetadataChanged(int player_id, base::TimeDelta duration,
@@ -107,7 +105,7 @@ class WebMediaPlayerProxyImplAndroid
                     const std::string& message,
                     const std::string& destination_url);
 
-  webkit_media::WebMediaPlayerManagerAndroid* manager_;
+  WebMediaPlayerManagerAndroid* manager_;
 
   DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerProxyImplAndroid);
 };