Rename PrerenderWebMediaPlayer to PrerenderMediaLoadDeferrer.

As of r209797 it no longer inherits from WebKit::WebMediaPlayer.

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

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

2 files changed, 18 insertions, 19 deletions

diff --git a/chrome/renderer/prerender/prerender_webmediaplayer.cc b/chrome/renderer/prerender/prerender_media_load_deferrer.cc
index c81402c..0ed9dc5 100644
--- a/chrome/renderer/prerender/prerender_webmediaplayer.cc
+++ b/chrome/renderer/prerender/prerender_media_load_deferrer.cc
@@ -1,8 +1,8 @@
-// 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 "chrome/renderer/prerender/prerender_webmediaplayer.h"
+#include "chrome/renderer/prerender/prerender_media_load_deferrer.h"
 
 #include "base/callback_helpers.h"
 #include "chrome/common/prerender_messages.h"
@@ -10,7 +10,7 @@
 
 namespace prerender {
 
-PrerenderWebMediaPlayer::PrerenderWebMediaPlayer(
+PrerenderMediaLoadDeferrer::PrerenderMediaLoadDeferrer(
     content::RenderView* render_view,
     const base::Closure& closure)
     : RenderViewObserver(render_view),
@@ -19,19 +19,20 @@ PrerenderWebMediaPlayer::PrerenderWebMediaPlayer(
   DCHECK(!continue_loading_cb_.is_null());
 }
 
-PrerenderWebMediaPlayer::~PrerenderWebMediaPlayer() {}
+PrerenderMediaLoadDeferrer::~PrerenderMediaLoadDeferrer() {}
 
-bool PrerenderWebMediaPlayer::OnMessageReceived(const IPC::Message& message) {
-  IPC_BEGIN_MESSAGE_MAP(PrerenderWebMediaPlayer, message)
+bool PrerenderMediaLoadDeferrer::OnMessageReceived(
+    const IPC::Message& message) {
+  IPC_BEGIN_MESSAGE_MAP(PrerenderMediaLoadDeferrer, message)
     IPC_MESSAGE_HANDLER(PrerenderMsg_SetIsPrerendering, OnSetIsPrerendering)
   IPC_END_MESSAGE_MAP()
 
   return false;
 }
 
-void PrerenderWebMediaPlayer::OnSetIsPrerendering(bool is_prerendering) {
+void PrerenderMediaLoadDeferrer::OnSetIsPrerendering(bool is_prerendering) {
   // Prerendering can only be enabled prior to a RenderView's first
-  // navigation, so no PrerenderWebMediaPlayer should see the notification
+  // navigation, so no PrerenderMediaLoadDeferrer should see the notification
   // that enables prerendering.
   DCHECK(!is_prerendering);
   if (!is_prerendering_ || is_prerendering)
diff --git a/chrome/renderer/prerender/prerender_webmediaplayer.h b/chrome/renderer/prerender/prerender_media_load_deferrer.h
index 60f9403..2c0f4aa 100644
--- a/chrome/renderer/prerender/prerender_webmediaplayer.h
+++ b/chrome/renderer/prerender/prerender_media_load_deferrer.h
@@ -1,9 +1,9 @@
-// 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.
 
-#ifndef CHROME_RENDERER_PRERENDER_PRERENDER_WEBMEDIAPLAYER_H_
-#define CHROME_RENDERER_PRERENDER_PRERENDER_WEBMEDIAPLAYER_H_
+#ifndef CHROME_RENDERER_PRERENDER_PRERENDER_MEDIA_LOAD_DEFERRER_H_
+#define CHROME_RENDERER_PRERENDER_PRERENDER_MEDIA_LOAD_DEFERRER_H_
 
 #include "base/callback.h"
 #include "content/public/renderer/render_view_observer.h"
@@ -12,15 +12,13 @@ namespace prerender {
 
 // Defers media player loading in prerendered pages until the prerendered page
 // is swapped in.
-//
-// TODO(scherkus): Rename as this class no longer inherits WebMediaPlayer.
-class PrerenderWebMediaPlayer : public content::RenderViewObserver {
+class PrerenderMediaLoadDeferrer : public content::RenderViewObserver {
  public:
   // Will run |closure| to continue loading the media resource once the page is
   // swapped in.
-  PrerenderWebMediaPlayer(content::RenderView* render_view,
-                          const base::Closure& closure);
-  virtual ~PrerenderWebMediaPlayer();
+  PrerenderMediaLoadDeferrer(content::RenderView* render_view,
+                             const base::Closure& closure);
+  virtual ~PrerenderMediaLoadDeferrer();
 
  private:
   // RenderViewObserver method:
@@ -31,9 +29,9 @@ class PrerenderWebMediaPlayer : public content::RenderViewObserver {
   bool is_prerendering_;
   base::Closure continue_loading_cb_;
 
-  DISALLOW_COPY_AND_ASSIGN(PrerenderWebMediaPlayer);
+  DISALLOW_COPY_AND_ASSIGN(PrerenderMediaLoadDeferrer);
 };
 
 }  // namespace prerender
 
-#endif  // CHROME_RENDERER_PRERENDER_PRERENDER_WEBMEDIAPLAYER_H_
+#endif  // CHROME_RENDERER_PRERENDER_PRERENDER_MEDIA_LOAD_DEFERRER_H_