Merge MediaPlayerAndroid with MediaPlayerImplAndroid.

After deleting the MediaPlayerInProcessAndroid, we no longer need to have a base WMPA class for android.
Merging these 2 classes into a single one.

Review URL: https://chromiumcodereview.appspot.com/14203003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@196877 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 20 insertions, 33 deletions

diff --git a/content/renderer/media/webmediaplayer_proxy_impl_android.cc b/content/renderer/media/webmediaplayer_proxy_impl_android.cc
index d89ec3f..0a164ae 100644
--- a/content/renderer/media/webmediaplayer_proxy_impl_android.cc
+++ b/content/renderer/media/webmediaplayer_proxy_impl_android.cc
@@ -7,7 +7,7 @@
 #include "base/bind.h"
 #include "base/message_loop.h"
 #include "content/common/media/media_player_messages.h"
-#include "webkit/media/android/webmediaplayer_impl_android.h"
+#include "webkit/media/android/webmediaplayer_android.h"
 #include "webkit/media/android/webmediaplayer_manager_android.h"
 
 namespace content {
@@ -81,94 +81,82 @@ void WebMediaPlayerProxyImplAndroid::OnMediaMetadataChanged(
     int width,
     int height,
     bool success) {
-  webkit_media::WebMediaPlayerImplAndroid* player =
-      GetWebMediaPlayer(player_id);
+  webkit_media::WebMediaPlayerAndroid* player = GetWebMediaPlayer(player_id);
   if (player)
     player->OnMediaMetadataChanged(duration, width, height, success);
 }
 
 void WebMediaPlayerProxyImplAndroid::OnMediaPlaybackCompleted(
     int player_id) {
-  webkit_media::WebMediaPlayerImplAndroid* player =
-      GetWebMediaPlayer(player_id);
+  webkit_media::WebMediaPlayerAndroid* player = GetWebMediaPlayer(player_id);
   if (player)
     player->OnPlaybackComplete();
 }
 
 void WebMediaPlayerProxyImplAndroid::OnMediaBufferingUpdate(
     int player_id, int percent) {
-  webkit_media::WebMediaPlayerImplAndroid* player =
-      GetWebMediaPlayer(player_id);
+  webkit_media::WebMediaPlayerAndroid* player = GetWebMediaPlayer(player_id);
   if (player)
     player->OnBufferingUpdate(percent);
 }
 
 void WebMediaPlayerProxyImplAndroid::OnMediaSeekCompleted(
     int player_id, base::TimeDelta current_time) {
-  webkit_media::WebMediaPlayerImplAndroid* player =
-      GetWebMediaPlayer(player_id);
+  webkit_media::WebMediaPlayerAndroid* player = GetWebMediaPlayer(player_id);
   if (player)
     player->OnSeekComplete(current_time);
 }
 
 void WebMediaPlayerProxyImplAndroid::OnMediaError(
     int player_id, int error) {
-  webkit_media::WebMediaPlayerImplAndroid* player =
-      GetWebMediaPlayer(player_id);
+  webkit_media::WebMediaPlayerAndroid* player = GetWebMediaPlayer(player_id);
   if (player)
     player->OnMediaError(error);
 }
 
 void WebMediaPlayerProxyImplAndroid::OnVideoSizeChanged(
     int player_id, int width, int height) {
-  webkit_media::WebMediaPlayerImplAndroid* player =
-      GetWebMediaPlayer(player_id);
+  webkit_media::WebMediaPlayerAndroid* player = GetWebMediaPlayer(player_id);
   if (player)
     player->OnVideoSizeChanged(width, height);
 }
 
 void WebMediaPlayerProxyImplAndroid::OnTimeUpdate(
     int player_id, base::TimeDelta current_time) {
-  webkit_media::WebMediaPlayerImplAndroid* player =
-      GetWebMediaPlayer(player_id);
+  webkit_media::WebMediaPlayerAndroid* player = GetWebMediaPlayer(player_id);
   if (player)
     player->OnTimeUpdate(current_time);
 }
 
 void WebMediaPlayerProxyImplAndroid::OnMediaPlayerReleased(
     int player_id) {
-  webkit_media::WebMediaPlayerImplAndroid* player =
-      GetWebMediaPlayer(player_id);
+  webkit_media::WebMediaPlayerAndroid* player = GetWebMediaPlayer(player_id);
   if (player)
     player->OnPlayerReleased();
 }
 
 void WebMediaPlayerProxyImplAndroid::OnDidEnterFullscreen(
     int player_id) {
-  webkit_media::WebMediaPlayerImplAndroid* player =
-      GetWebMediaPlayer(player_id);
+  webkit_media::WebMediaPlayerAndroid* player = GetWebMediaPlayer(player_id);
   if (player)
     player->OnDidEnterFullscreen();
 }
 
 void WebMediaPlayerProxyImplAndroid::OnDidExitFullscreen(
     int player_id) {
-  webkit_media::WebMediaPlayerImplAndroid* player =
-      GetWebMediaPlayer(player_id);
+  webkit_media::WebMediaPlayerAndroid* player = GetWebMediaPlayer(player_id);
   if (player)
     player->OnDidExitFullscreen();
 }
 
 void WebMediaPlayerProxyImplAndroid::OnPlayerPlay(int player_id) {
-  webkit_media::WebMediaPlayerImplAndroid* player =
-      GetWebMediaPlayer(player_id);
+  webkit_media::WebMediaPlayerAndroid* player = GetWebMediaPlayer(player_id);
   if (player)
     player->OnMediaPlayerPlay();
 }
 
 void WebMediaPlayerProxyImplAndroid::OnPlayerPause(int player_id) {
-  webkit_media::WebMediaPlayerImplAndroid* player =
-      GetWebMediaPlayer(player_id);
+  webkit_media::WebMediaPlayerAndroid* player = GetWebMediaPlayer(player_id);
   if (player)
     player->OnMediaPlayerPause();
 }
@@ -199,9 +187,9 @@ void WebMediaPlayerProxyImplAndroid::DidCommitCompositorFrame() {
 }
 #endif
 
-webkit_media::WebMediaPlayerImplAndroid*
+webkit_media::WebMediaPlayerAndroid*
     WebMediaPlayerProxyImplAndroid::GetWebMediaPlayer(int player_id) {
-  return static_cast<webkit_media::WebMediaPlayerImplAndroid*>(
+  return static_cast<webkit_media::WebMediaPlayerAndroid*>(
       manager_->GetMediaPlayer(player_id));
 }
 
diff --git a/content/renderer/media/webmediaplayer_proxy_impl_android.h b/content/renderer/media/webmediaplayer_proxy_impl_android.h
index 2175b3d..74830cd 100644
--- a/content/renderer/media/webmediaplayer_proxy_impl_android.h
+++ b/content/renderer/media/webmediaplayer_proxy_impl_android.h
@@ -11,14 +11,14 @@
 #include "webkit/media/android/webmediaplayer_proxy_android.h"
 
 namespace webkit_media {
-class WebMediaPlayerImplAndroid;
+class WebMediaPlayerAndroid;
 class WebMediaPlayerManagerAndroid;
 }
 
 namespace content {
 
 // This class manages all the IPC communications between
-// WebMediaPlayerImplAndroid and the MediaPlayerManagerAndroid in the browser
+// WebMediaPlayerAndroid and the MediaPlayerManagerAndroid in the browser
 // process.
 class WebMediaPlayerProxyImplAndroid
     : public RenderViewObserver,
@@ -26,7 +26,7 @@ class WebMediaPlayerProxyImplAndroid
  public:
   // Construct a WebMediaPlayerProxyImplAndroid object for the |render_view|.
   // |manager| is passed to this class so that it can find the right
-  // WebMediaPlayerImplAndroid using player IDs.
+  // WebMediaPlayerAndroid using player IDs.
   WebMediaPlayerProxyImplAndroid(
       RenderView* render_view,
       webkit_media::WebMediaPlayerManagerAndroid* manager);
@@ -52,7 +52,7 @@ class WebMediaPlayerProxyImplAndroid
 #endif
 
  private:
-  webkit_media::WebMediaPlayerImplAndroid* GetWebMediaPlayer(int player_id);
+  webkit_media::WebMediaPlayerAndroid* GetWebMediaPlayer(int player_id);
 
   // Message handlers.
   void OnMediaMetadataChanged(int player_id, base::TimeDelta duration,
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index 6f1b764..0a2d66c 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -225,7 +225,6 @@
 #include "ui/gfx/rect_f.h"
 #include "webkit/media/android/media_player_bridge_manager_impl.h"
 #include "webkit/media/android/webmediaplayer_android.h"
-#include "webkit/media/android/webmediaplayer_impl_android.h"
 #include "webkit/media/android/webmediaplayer_manager_android.h"
 #elif defined(OS_WIN)
 // TODO(port): these files are currently Windows only because they concern:
@@ -2700,7 +2699,7 @@ WebMediaPlayer* RenderViewImpl::createMediaPlayer(
     media_player_proxy_ = new WebMediaPlayerProxyImplAndroid(
         this, media_player_manager_.get());
   }
-  return new webkit_media::WebMediaPlayerImplAndroid(
+  return new webkit_media::WebMediaPlayerAndroid(
       frame,
       client,
       media_player_manager_.get(),