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

content/renderer/media/webmediaplayer_proxy_impl_android.cc

Index: content/renderer/media/webmediaplayer_proxy_impl_android.cc
diff --git a/content/renderer/media/webmediaplayer_proxy_impl_android.cc b/content/renderer/media/webmediaplayer_proxy_impl_android.cc
index 1c2f5c6ec2a4fe25fc66b35ab133156288c434ba..16340aa835a680e2d6e221c0c7a4110d7013a564 100644
--- a/content/renderer/media/webmediaplayer_proxy_impl_android.cc
+++ b/content/renderer/media/webmediaplayer_proxy_impl_android.cc
@@ -7,14 +7,14 @@
 #include "base/bind.h"
 #include "base/message_loop.h"
 #include "content/common/media/media_player_messages_android.h"
-#include "webkit/renderer/media/android/webmediaplayer_android.h"
-#include "webkit/renderer/media/android/webmediaplayer_manager_android.h"
+#include "content/renderer/media/android/webmediaplayer_android.h"
+#include "content/renderer/media/android/webmediaplayer_manager_android.h"
 
 namespace content {
 
 WebMediaPlayerProxyImplAndroid::WebMediaPlayerProxyImplAndroid(
     RenderView* render_view,
-    webkit_media::WebMediaPlayerManagerAndroid* manager)
+    WebMediaPlayerManagerAndroid* manager)
     : RenderViewObserver(render_view),
       manager_(manager) {
 }
@@ -93,77 +93,77 @@ void WebMediaPlayerProxyImplAndroid::OnMediaMetadataChanged(
     int width,
     int height,
     bool success) {
-  webkit_media::WebMediaPlayerAndroid* player = GetWebMediaPlayer(player_id);
+  WebMediaPlayerAndroid* player = GetWebMediaPlayer(player_id);
   if (player)
     player->OnMediaMetadataChanged(duration, width, height, success);
 }
 
 void WebMediaPlayerProxyImplAndroid::OnMediaPlaybackCompleted(int player_id) {
-  webkit_media::WebMediaPlayerAndroid* player = GetWebMediaPlayer(player_id);
+  WebMediaPlayerAndroid* player = GetWebMediaPlayer(player_id);
   if (player)
     player->OnPlaybackComplete();
 }
 
 void WebMediaPlayerProxyImplAndroid::OnMediaBufferingUpdate(int player_id,
                                                             int percent) {
-  webkit_media::WebMediaPlayerAndroid* player = GetWebMediaPlayer(player_id);
+  WebMediaPlayerAndroid* player = GetWebMediaPlayer(player_id);
   if (player)
     player->OnBufferingUpdate(percent);
 }
 
 void WebMediaPlayerProxyImplAndroid::OnMediaSeekCompleted(
     int player_id, base::TimeDelta current_time) {
-  webkit_media::WebMediaPlayerAndroid* player = GetWebMediaPlayer(player_id);
+  WebMediaPlayerAndroid* player = GetWebMediaPlayer(player_id);
   if (player)
     player->OnSeekComplete(current_time);
 }
 
 void WebMediaPlayerProxyImplAndroid::OnMediaError(int player_id, int error) {
-  webkit_media::WebMediaPlayerAndroid* player = GetWebMediaPlayer(player_id);
+  WebMediaPlayerAndroid* player = GetWebMediaPlayer(player_id);
   if (player)
     player->OnMediaError(error);
 }
 
 void WebMediaPlayerProxyImplAndroid::OnVideoSizeChanged(
     int player_id, int width, int height) {
-  webkit_media::WebMediaPlayerAndroid* player = GetWebMediaPlayer(player_id);
+  WebMediaPlayerAndroid* player = GetWebMediaPlayer(player_id);
   if (player)
     player->OnVideoSizeChanged(width, height);
 }
 
 void WebMediaPlayerProxyImplAndroid::OnTimeUpdate(
     int player_id, base::TimeDelta current_time) {
-  webkit_media::WebMediaPlayerAndroid* player = GetWebMediaPlayer(player_id);
+  WebMediaPlayerAndroid* player = GetWebMediaPlayer(player_id);
   if (player)
     player->OnTimeUpdate(current_time);
 }
 
 void WebMediaPlayerProxyImplAndroid::OnMediaPlayerReleased(int player_id) {
-  webkit_media::WebMediaPlayerAndroid* player = GetWebMediaPlayer(player_id);
+  WebMediaPlayerAndroid* player = GetWebMediaPlayer(player_id);
   if (player)
     player->OnPlayerReleased();
 }
 
 void WebMediaPlayerProxyImplAndroid::OnDidEnterFullscreen(int player_id) {
-  webkit_media::WebMediaPlayerAndroid* player = GetWebMediaPlayer(player_id);
+  WebMediaPlayerAndroid* player = GetWebMediaPlayer(player_id);
   if (player)
     player->OnDidEnterFullscreen();
 }
 
 void WebMediaPlayerProxyImplAndroid::OnDidExitFullscreen(int player_id) {
-  webkit_media::WebMediaPlayerAndroid* player = GetWebMediaPlayer(player_id);
+  WebMediaPlayerAndroid* player = GetWebMediaPlayer(player_id);
   if (player)
     player->OnDidExitFullscreen();
 }
 
 void WebMediaPlayerProxyImplAndroid::OnPlayerPlay(int player_id) {
-  webkit_media::WebMediaPlayerAndroid* player = GetWebMediaPlayer(player_id);
+  WebMediaPlayerAndroid* player = GetWebMediaPlayer(player_id);
   if (player)
     player->OnMediaPlayerPlay();
 }
 
 void WebMediaPlayerProxyImplAndroid::OnPlayerPause(int player_id) {
-  webkit_media::WebMediaPlayerAndroid* player = GetWebMediaPlayer(player_id);
+  WebMediaPlayerAndroid* player = GetWebMediaPlayer(player_id);
   if (player)
     player->OnMediaPlayerPause();
 }
@@ -229,7 +229,7 @@ void WebMediaPlayerProxyImplAndroid::OnReadFromDemuxer(
     int player_id,
     media::DemuxerStream::Type type,
     bool seek_done) {
-  webkit_media::WebMediaPlayerAndroid* player = GetWebMediaPlayer(player_id);
+  WebMediaPlayerAndroid* player = GetWebMediaPlayer(player_id);
   if (player)
     player->OnReadFromDemuxer(type, seek_done);
 }
@@ -246,15 +246,15 @@ void WebMediaPlayerProxyImplAndroid::DurationChanged(
       routing_id(), player_id, duration));
 }
 
-webkit_media::WebMediaPlayerAndroid*
-    WebMediaPlayerProxyImplAndroid::GetWebMediaPlayer(int player_id) {
-  return static_cast<webkit_media::WebMediaPlayerAndroid*>(
+WebMediaPlayerAndroid* WebMediaPlayerProxyImplAndroid::GetWebMediaPlayer(
+    int player_id) {
+  return static_cast<WebMediaPlayerAndroid*>(
       manager_->GetMediaPlayer(player_id));
 }
 
 void WebMediaPlayerProxyImplAndroid::OnMediaSeekRequest(
     int player_id, base::TimeDelta time_to_seek, unsigned seek_request_id) {
-  webkit_media::WebMediaPlayerAndroid* player = GetWebMediaPlayer(player_id);
+  WebMediaPlayerAndroid* player = GetWebMediaPlayer(player_id);
   if (player) {
     Send(new MediaPlayerHostMsg_MediaSeekRequestAck(routing_id(), player_id,
         seek_request_id));
@@ -263,14 +263,14 @@ void WebMediaPlayerProxyImplAndroid::OnMediaSeekRequest(
 }
 
 void WebMediaPlayerProxyImplAndroid::OnMediaConfigRequest(int player_id) {
-  webkit_media::WebMediaPlayerAndroid* player = GetWebMediaPlayer(player_id);
+  WebMediaPlayerAndroid* player = GetWebMediaPlayer(player_id);
   if (player)
     player->OnMediaConfigRequest();
 }
 
 void WebMediaPlayerProxyImplAndroid::OnKeyAdded(int player_id,
                                                 const std::string& session_id) {
-  webkit_media::WebMediaPlayerAndroid* player = GetWebMediaPlayer(player_id);
+  WebMediaPlayerAndroid* player = GetWebMediaPlayer(player_id);
   if (player)
     player->OnKeyAdded(session_id);
 }
@@ -280,7 +280,7 @@ void WebMediaPlayerProxyImplAndroid::OnKeyError(
     const std::string& session_id,
     media::MediaKeys::KeyError error_code,
     int system_code) {
-  webkit_media::WebMediaPlayerAndroid* player = GetWebMediaPlayer(player_id);
+  WebMediaPlayerAndroid* player = GetWebMediaPlayer(player_id);
   if (player)
     player->OnKeyError(session_id, error_code, system_code);
 }
@@ -290,7 +290,7 @@ void WebMediaPlayerProxyImplAndroid::OnKeyMessage(
     const std::string& session_id,
     const std::string& message,
     const std::string& destination_url) {
-  webkit_media::WebMediaPlayerAndroid* player = GetWebMediaPlayer(player_id);
+  WebMediaPlayerAndroid* player = GetWebMediaPlayer(player_id);
   if (player)
     player->OnKeyMessage(session_id, message, destination_url);
 }