Moving media-related files from webkit/glue/ to webkit/media/.

content/renderer/render_view_impl.cc

Index: content/renderer/render_view_impl.cc
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index 80ea6e29f31a23c7a3b08c811d9361d99eff3205..4cbeda91088821fc8df5ea63fe4ef3daece29ba6 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -136,13 +136,13 @@
 #include "webkit/glue/form_data.h"
 #include "webkit/glue/form_field.h"
 #include "webkit/glue/glue_serialize.h"
-#include "webkit/glue/media/video_renderer_impl.h"
 #include "webkit/glue/password_form_dom_manager.h"
 #include "webkit/glue/webdropdata.h"
 #include "webkit/glue/webkit_constants.h"
 #include "webkit/glue/webkit_glue.h"
-#include "webkit/glue/webmediaplayer_impl.h"
 #include "webkit/glue/weburlloader_impl.h"
+#include "webkit/media/video_renderer_impl.h"
+#include "webkit/media/webmediaplayer_impl.h"
 #include "webkit/plugins/npapi/default_plugin_shared.h"
 #include "webkit/plugins/npapi/plugin_list.h"
 #include "webkit/plugins/npapi/webplugin_delegate.h"
@@ -1935,15 +1935,15 @@ WebMediaPlayer* RenderViewImpl::createMediaPlayer(
     collection->AddAudioRenderer(new AudioRendererImpl());
   }
 
-  scoped_refptr<webkit_glue::WebVideoRenderer> video_renderer;
+  scoped_refptr<webkit_media::WebVideoRenderer> video_renderer;
   bool pts_logging = cmd_line->HasSwitch(switches::kEnableVideoLogging);
-  scoped_refptr<webkit_glue::VideoRendererImpl> renderer(
-      new webkit_glue::VideoRendererImpl(pts_logging));
+  scoped_refptr<webkit_media::VideoRendererImpl> renderer(
+      new webkit_media::VideoRendererImpl(pts_logging));
   collection->AddVideoRenderer(renderer);
   video_renderer = renderer;
 
-  scoped_ptr<webkit_glue::WebMediaPlayerImpl> result(
-      new webkit_glue::WebMediaPlayerImpl(client,
+  scoped_ptr<webkit_media::WebMediaPlayerImpl> result(
+      new webkit_media::WebMediaPlayerImpl(client,
                                           AsWeakPtr(),
                                           collection.release(),
                                           message_loop_factory.release(),
@@ -3211,7 +3211,7 @@ WebCookieJar* RenderViewImpl::GetCookieJar() {
   return &cookie_jar_;
 }
 
-void RenderViewImpl::DidPlay(webkit_glue::WebMediaPlayerImpl* player) {
+void RenderViewImpl::DidPlay(webkit_media::WebMediaPlayerImpl* player) {
   Send(new ViewHostMsg_MediaNotification(routing_id_,
                                          reinterpret_cast<int64>(player),
                                          player->hasVideo(),
@@ -3219,7 +3219,7 @@ void RenderViewImpl::DidPlay(webkit_glue::WebMediaPlayerImpl* player) {
                                          true));
 }
 
-void RenderViewImpl::DidPause(webkit_glue::WebMediaPlayerImpl* player) {
+void RenderViewImpl::DidPause(webkit_media::WebMediaPlayerImpl* player) {
   Send(new ViewHostMsg_MediaNotification(routing_id_,
                                          reinterpret_cast<int64>(player),
                                          player->hasVideo(),
@@ -3227,7 +3227,7 @@ void RenderViewImpl::DidPause(webkit_glue::WebMediaPlayerImpl* player) {
                                          false));
 }
 
-void RenderViewImpl::PlayerGone(webkit_glue::WebMediaPlayerImpl* player) {
+void RenderViewImpl::PlayerGone(webkit_media::WebMediaPlayerImpl* player) {
   DidPause(player);
 }