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

content/renderer/media/android/webmediaplayer_proxy_android.cc

Index: content/renderer/media/android/webmediaplayer_proxy_android.cc
diff --git a/content/renderer/media/webmediaplayer_proxy_impl_android.cc b/content/renderer/media/android/webmediaplayer_proxy_android.cc
similarity index 50%
rename from content/renderer/media/webmediaplayer_proxy_impl_android.cc
rename to content/renderer/media/android/webmediaplayer_proxy_android.cc
index 7f6e8270efb55cdbf35a4be6f58d9395bdb68cd2..f9e465d6f86c4377196d20339866bf61110ae250 100644
--- a/content/renderer/media/webmediaplayer_proxy_impl_android.cc
+++ b/content/renderer/media/android/webmediaplayer_proxy_android.cc
@@ -1,32 +1,29 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 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.
 
-#include "content/renderer/media/webmediaplayer_proxy_impl_android.h"
+#include "content/renderer/media/android/webmediaplayer_proxy_android.h"
 
 #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(
+WebMediaPlayerProxyAndroid::WebMediaPlayerProxyAndroid(
     RenderView* render_view,
-    webkit_media::WebMediaPlayerManagerAndroid* manager)
-    : RenderViewObserver(render_view),
-      manager_(manager) {
-}
+    WebMediaPlayerManagerAndroid* manager)
+    : RenderViewObserver(render_view), manager_(manager) {}
 
-WebMediaPlayerProxyImplAndroid::~WebMediaPlayerProxyImplAndroid() {
+WebMediaPlayerProxyAndroid::~WebMediaPlayerProxyAndroid() {
   Send(new MediaPlayerHostMsg_DestroyAllMediaPlayers(routing_id()));
 }
 
-bool WebMediaPlayerProxyImplAndroid::OnMessageReceived(
-    const IPC::Message& msg) {
+bool WebMediaPlayerProxyAndroid::OnMessageReceived(const IPC::Message& msg) {
   bool handled = true;
-  IPC_BEGIN_MESSAGE_MAP(WebMediaPlayerProxyImplAndroid, msg)
+  IPC_BEGIN_MESSAGE_MAP(WebMediaPlayerProxyAndroid, msg)
     IPC_MESSAGE_HANDLER(MediaPlayerMsg_MediaMetadataChanged,
                         OnMediaMetadataChanged)
     IPC_MESSAGE_HANDLER(MediaPlayerMsg_MediaPlaybackCompleted,
@@ -55,171 +52,142 @@ bool WebMediaPlayerProxyImplAndroid::OnMessageReceived(
   return handled;
 }
 
-void WebMediaPlayerProxyImplAndroid::Initialize(
+void WebMediaPlayerProxyAndroid::Initialize(
     int player_id,
     const GURL& url,
     media::MediaPlayerAndroid::SourceType source_type,
     const GURL& first_party_for_cookies) {
-  Send(new MediaPlayerHostMsg_MediaPlayerInitialize(routing_id(),
-                                                    player_id,
-                                                    url,
-                                                    source_type,
-                                                    first_party_for_cookies));
+  Send(new MediaPlayerHostMsg_MediaPlayerInitialize(
+      routing_id(), player_id, url, source_type, first_party_for_cookies));
 }
 
-void WebMediaPlayerProxyImplAndroid::Start(int player_id) {
+void WebMediaPlayerProxyAndroid::Start(int player_id) {
   Send(new MediaPlayerHostMsg_MediaPlayerStart(routing_id(), player_id));
 }
 
-void WebMediaPlayerProxyImplAndroid::Pause(int player_id) {
+void WebMediaPlayerProxyAndroid::Pause(int player_id) {
   Send(new MediaPlayerHostMsg_MediaPlayerPause(routing_id(), player_id));
 }
 
-void WebMediaPlayerProxyImplAndroid::Seek(int player_id, base::TimeDelta time) {
+void WebMediaPlayerProxyAndroid::Seek(int player_id, base::TimeDelta time) {
   Send(new MediaPlayerHostMsg_MediaPlayerSeek(routing_id(), player_id, time));
 }
 
-void WebMediaPlayerProxyImplAndroid::ReleaseResources(int player_id) {
+void WebMediaPlayerProxyAndroid::ReleaseResources(int player_id) {
   Send(new MediaPlayerHostMsg_MediaPlayerRelease(routing_id(), player_id));
 }
 
-void WebMediaPlayerProxyImplAndroid::DestroyPlayer(int player_id) {
+void WebMediaPlayerProxyAndroid::DestroyPlayer(int player_id) {
   Send(new MediaPlayerHostMsg_DestroyMediaPlayer(routing_id(), player_id));
 }
 
-void WebMediaPlayerProxyImplAndroid::OnMediaMetadataChanged(
+void WebMediaPlayerProxyAndroid::OnMediaMetadataChanged(
     int player_id,
     base::TimeDelta duration,
     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);
+void WebMediaPlayerProxyAndroid::OnMediaPlaybackCompleted(int 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);
+void WebMediaPlayerProxyAndroid::OnMediaBufferingUpdate(int player_id,
+                                                        int percent) {
+  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);
+void WebMediaPlayerProxyAndroid::OnMediaSeekCompleted(
+    int player_id,
+    base::TimeDelta current_time) {
+  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);
+void WebMediaPlayerProxyAndroid::OnMediaError(int player_id, int error) {
+  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);
+void WebMediaPlayerProxyAndroid::OnVideoSizeChanged(int player_id,
+                                                    int width,
+                                                    int height) {
+  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);
+void WebMediaPlayerProxyAndroid::OnTimeUpdate(int player_id,
+                                              base::TimeDelta current_time) {
+  WebMediaPlayerAndroid* player = GetWebMediaPlayer(player_id);
   if (player)
     player->OnTimeUpdate(current_time);
 }
 
-void WebMediaPlayerProxyImplAndroid::OnMediaPlayerReleased(int player_id) {
-  webkit_media::WebMediaPlayerAndroid* player = GetWebMediaPlayer(player_id);
+void WebMediaPlayerProxyAndroid::OnMediaPlayerReleased(int player_id) {
+  WebMediaPlayerAndroid* player = GetWebMediaPlayer(player_id);
   if (player)
     player->OnPlayerReleased();
 }
 
-void WebMediaPlayerProxyImplAndroid::OnDidEnterFullscreen(int player_id) {
-  webkit_media::WebMediaPlayerAndroid* player = GetWebMediaPlayer(player_id);
+void WebMediaPlayerProxyAndroid::OnDidEnterFullscreen(int player_id) {
+  WebMediaPlayerAndroid* player = GetWebMediaPlayer(player_id);
   if (player)
     player->OnDidEnterFullscreen();
 }
 
-void WebMediaPlayerProxyImplAndroid::OnDidExitFullscreen(int player_id) {
-  webkit_media::WebMediaPlayerAndroid* player = GetWebMediaPlayer(player_id);
+void WebMediaPlayerProxyAndroid::OnDidExitFullscreen(int player_id) {
+  WebMediaPlayerAndroid* player = GetWebMediaPlayer(player_id);
   if (player)
     player->OnDidExitFullscreen();
 }
 
-void WebMediaPlayerProxyImplAndroid::OnPlayerPlay(int player_id) {
-  webkit_media::WebMediaPlayerAndroid* player = GetWebMediaPlayer(player_id);
+void WebMediaPlayerProxyAndroid::OnPlayerPlay(int player_id) {
+  WebMediaPlayerAndroid* player = GetWebMediaPlayer(player_id);
   if (player)
     player->OnMediaPlayerPlay();
 }
 
-void WebMediaPlayerProxyImplAndroid::OnPlayerPause(int player_id) {
-  webkit_media::WebMediaPlayerAndroid* player = GetWebMediaPlayer(player_id);
+void WebMediaPlayerProxyAndroid::OnPlayerPause(int player_id) {
+  WebMediaPlayerAndroid* player = GetWebMediaPlayer(player_id);
   if (player)
     player->OnMediaPlayerPause();
 }
 
-void WebMediaPlayerProxyImplAndroid::EnterFullscreen(int player_id) {
+void WebMediaPlayerProxyAndroid::EnterFullscreen(int player_id) {
   Send(new MediaPlayerHostMsg_EnterFullscreen(routing_id(), player_id));
 }
 
-void WebMediaPlayerProxyImplAndroid::ExitFullscreen(int player_id) {
+void WebMediaPlayerProxyAndroid::ExitFullscreen(int player_id) {
   Send(new MediaPlayerHostMsg_ExitFullscreen(routing_id(), player_id));
 }
 
-void WebMediaPlayerProxyImplAndroid::ReadFromDemuxerAck(
+void WebMediaPlayerProxyAndroid::ReadFromDemuxerAck(
     int player_id,
     const media::MediaPlayerHostMsg_ReadFromDemuxerAck_Params& params) {
   Send(new MediaPlayerHostMsg_ReadFromDemuxerAck(
       routing_id(), player_id, params));
 }
 
-void WebMediaPlayerProxyImplAndroid::InitializeCDM(
-    int media_keys_id,
-    const std::vector<uint8>& uuid) {
-  Send(new MediaKeysHostMsg_InitializeCDM(routing_id(), media_keys_id, uuid));
-}
-
-void WebMediaPlayerProxyImplAndroid::GenerateKeyRequest(
-    int media_keys_id,
-    const std::string& type,
-    const std::vector<uint8>& init_data) {
-  Send(new MediaKeysHostMsg_GenerateKeyRequest(
-      routing_id(), media_keys_id, type, init_data));
-}
-
-void WebMediaPlayerProxyImplAndroid::AddKey(int media_keys_id,
-                                            const std::vector<uint8>& key,
-                                            const std::vector<uint8>& init_data,
-                                            const std::string& session_id) {
-  Send(new MediaKeysHostMsg_AddKey(
-      routing_id(), media_keys_id, key, init_data, session_id));
-}
-
-void WebMediaPlayerProxyImplAndroid::CancelKeyRequest(
-    int media_keys_id,
-    const std::string& session_id) {
-  Send(new MediaKeysHostMsg_CancelKeyRequest(
-      routing_id(), media_keys_id, session_id));
-}
-
 #if defined(GOOGLE_TV)
-void WebMediaPlayerProxyImplAndroid::RequestExternalSurface(
-    int player_id, const gfx::RectF& geometry) {
+void WebMediaPlayerProxyAndroid::RequestExternalSurface(
+    int player_id,
+    const gfx::RectF& geometry) {
   Send(new MediaPlayerHostMsg_NotifyExternalSurface(
       routing_id(), player_id, true, geometry));
 }
 
-void WebMediaPlayerProxyImplAndroid::DidCommitCompositorFrame() {
+void WebMediaPlayerProxyAndroid::DidCommitCompositorFrame() {
   std::map<int, gfx::RectF> geometry_change;
   manager_->RetrieveGeometryChanges(&geometry_change);
   for (std::map<int, gfx::RectF>::iterator it = geometry_change.begin();
@@ -231,75 +199,103 @@ void WebMediaPlayerProxyImplAndroid::DidCommitCompositorFrame() {
 }
 #endif
 
-void WebMediaPlayerProxyImplAndroid::OnReadFromDemuxer(
+void WebMediaPlayerProxyAndroid::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);
 }
 
-void WebMediaPlayerProxyImplAndroid::DemuxerReady(
+void WebMediaPlayerProxyAndroid::DemuxerReady(
     int player_id,
     const media::MediaPlayerHostMsg_DemuxerReady_Params& params) {
   Send(new MediaPlayerHostMsg_DemuxerReady(routing_id(), player_id, params));
 }
 
-void WebMediaPlayerProxyImplAndroid::DurationChanged(
-    int player_id, const base::TimeDelta& duration) {
+void WebMediaPlayerProxyAndroid::DurationChanged(
+    int player_id,
+    const base::TimeDelta& duration) {
   Send(new MediaPlayerHostMsg_DurationChanged(
       routing_id(), player_id, duration));
 }
 
-webkit_media::WebMediaPlayerAndroid*
-    WebMediaPlayerProxyImplAndroid::GetWebMediaPlayer(int player_id) {
-  return static_cast<webkit_media::WebMediaPlayerAndroid*>(
+void WebMediaPlayerProxyAndroid::InitializeCDM(int media_keys_id,
+                                               const std::vector<uint8>& uuid) {
+  Send(new MediaKeysHostMsg_InitializeCDM(routing_id(), media_keys_id, uuid));
+}
+
+void WebMediaPlayerProxyAndroid::GenerateKeyRequest(
+    int media_keys_id,
+    const std::string& type,
+    const std::vector<uint8>& init_data) {
+  Send(new MediaKeysHostMsg_GenerateKeyRequest(
+      routing_id(), media_keys_id, type, init_data));
+}
+
+void WebMediaPlayerProxyAndroid::AddKey(int media_keys_id,
+                                        const std::vector<uint8>& key,
+                                        const std::vector<uint8>& init_data,
+                                        const std::string& session_id) {
+  Send(new MediaKeysHostMsg_AddKey(
+      routing_id(), media_keys_id, key, init_data, session_id));
+}
+
+void WebMediaPlayerProxyAndroid::CancelKeyRequest(
+    int media_keys_id,
+    const std::string& session_id) {
+  Send(new MediaKeysHostMsg_CancelKeyRequest(
+      routing_id(), media_keys_id, session_id));
+}
+
+WebMediaPlayerAndroid* WebMediaPlayerProxyAndroid::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);
+void WebMediaPlayerProxyAndroid::OnMediaSeekRequest(
+    int player_id,
+    base::TimeDelta time_to_seek,
+    unsigned seek_request_id) {
+  WebMediaPlayerAndroid* player = GetWebMediaPlayer(player_id);
   if (player) {
-    Send(new MediaPlayerHostMsg_MediaSeekRequestAck(routing_id(), player_id,
-        seek_request_id));
+    Send(new MediaPlayerHostMsg_MediaSeekRequestAck(
+        routing_id(), player_id, seek_request_id));
     player->OnMediaSeekRequest(time_to_seek);
   }
 }
 
-void WebMediaPlayerProxyImplAndroid::OnMediaConfigRequest(int player_id) {
-  webkit_media::WebMediaPlayerAndroid* player = GetWebMediaPlayer(player_id);
+void WebMediaPlayerProxyAndroid::OnMediaConfigRequest(int player_id) {
+  WebMediaPlayerAndroid* player = GetWebMediaPlayer(player_id);
   if (player)
     player->OnMediaConfigRequest();
 }
 
-void WebMediaPlayerProxyImplAndroid::OnKeyAdded(int media_keys_id,
-                                                const std::string& session_id) {
-  webkit_media::WebMediaPlayerAndroid* player =
-      GetWebMediaPlayer(media_keys_id);
+void WebMediaPlayerProxyAndroid::OnKeyAdded(int media_keys_id,
+                                            const std::string& session_id) {
+  WebMediaPlayerAndroid* player = GetWebMediaPlayer(media_keys_id);
   if (player)
     player->OnKeyAdded(session_id);
 }
 
-void WebMediaPlayerProxyImplAndroid::OnKeyError(
+void WebMediaPlayerProxyAndroid::OnKeyError(
     int media_keys_id,
     const std::string& session_id,
     media::MediaKeys::KeyError error_code,
     int system_code) {
-  webkit_media::WebMediaPlayerAndroid* player =
-      GetWebMediaPlayer(media_keys_id);
+  WebMediaPlayerAndroid* player = GetWebMediaPlayer(media_keys_id);
   if (player)
     player->OnKeyError(session_id, error_code, system_code);
 }
 
-void WebMediaPlayerProxyImplAndroid::OnKeyMessage(
+void WebMediaPlayerProxyAndroid::OnKeyMessage(
     int media_keys_id,
     const std::string& session_id,
     const std::string& message,
     const std::string& destination_url) {
-  webkit_media::WebMediaPlayerAndroid* player =
-      GetWebMediaPlayer(media_keys_id);
+  WebMediaPlayerAndroid* player = GetWebMediaPlayer(media_keys_id);
   if (player)
     player->OnKeyMessage(session_id, message, destination_url);
 }