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

content/renderer/media/webmediaplayer_proxy_impl_android.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_PROXY_IMPL_ANDROID_H_
 #define CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_PROXY_IMPL_ANDROID_H_
 
 #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;
 
   // Methods inherited from WebMediaPlayerProxyAndroid.
   virtual void Initialize(
       int player_id,
       const GURL& url,
       media::MediaPlayerAndroid::SourceType source_type,
       const GURL& first_party_for_cookies) OVERRIDE;
@@ skipping 24 matching lines @@
 
 #if defined(GOOGLE_TV)
   virtual void RequestExternalSurface(
       int player_id, const gfx::RectF& geometry) OVERRIDE;
 
   // Methods inherited from RenderViewObserver.
   virtual void DidCommitCompositorFrame() OVERRIDE;
 #endif
 
  private:
-  webkit_media::WebMediaPlayerAndroid* GetWebMediaPlayer(int player_id);
+  WebMediaPlayerAndroid* GetWebMediaPlayer(int player_id);
 
   // Message handlers.
   void OnMediaMetadataChanged(int player_id, base::TimeDelta duration,
                               int width, int height, bool success);
   void OnMediaPlaybackCompleted(int player_id);
   void OnMediaBufferingUpdate(int player_id, int percent);
   void OnMediaSeekCompleted(int player_id, base::TimeDelta current_time);
   void OnMediaError(int player_id, int error);
   void OnVideoSizeChanged(int player_id, int width, int height);
   void OnTimeUpdate(int player_id, base::TimeDelta current_time);
@@ skipping 11 matching lines @@
                   const std::string& session_id);
   void OnKeyError(int player_id,
                   const std::string& session_id,
                   media::MediaKeys::KeyError error_code,
                   int system_code);
   void OnKeyMessage(int player_id,
                     const std::string& session_id,
                     const std::string& message,
                     const std::string& destination_url);
 
-  webkit_media::WebMediaPlayerManagerAndroid* manager_;
+  WebMediaPlayerManagerAndroid* manager_;
 
   DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerProxyImplAndroid);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_PROXY_IMPL_ANDROID_H_