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

content/renderer/render_view_impl.h

Index: content/renderer/render_view_impl.h
diff --git a/content/renderer/render_view_impl.h b/content/renderer/render_view_impl.h
index f8d742a76f7151fc29ad6b81bf64f112f24d6d6f..94af7c3d88cc7cb4725598c718b7614e970065d2 100644
--- a/content/renderer/render_view_impl.h
+++ b/content/renderer/render_view_impl.h
@@ -43,8 +43,8 @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebViewClient.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebNavigationType.h"
 #include "ui/gfx/surface/transport_dib.h"
-#include "webkit/glue/webmediaplayer_delegate.h"
 #include "webkit/glue/webpreferences.h"
+#include "webkit/media/webmediaplayer_delegate.h"
 #include "webkit/plugins/npapi/webplugin_page_delegate.h"
 
 #if defined(OS_WIN)
@@ -152,7 +152,7 @@ class RenderViewImpl : public RenderWidget,
                        public WebKit::WebPageSerializerClient,
                        public content::RenderView,
                        public webkit::npapi::WebPluginPageDelegate,
-                       public webkit_glue::WebMediaPlayerDelegate,
+                       public webkit_media::WebMediaPlayerDelegate,
                        public base::SupportsWeakPtr<RenderViewImpl> {
  public:
   // Creates a new RenderView.  The parent_hwnd specifies a HWND to use as the
@@ -586,11 +586,11 @@ class RenderViewImpl : public RenderWidget,
   virtual void DidStopLoadingForPlugin();
   virtual WebKit::WebCookieJar* GetCookieJar();
 
-  // webkit_glue::WebMediaPlayerDelegate implementation ------------------------
+  // webkit_media::WebMediaPlayerDelegate implementation -----------------------
 
-  virtual void DidPlay(webkit_glue::WebMediaPlayerImpl* player) OVERRIDE;
-  virtual void DidPause(webkit_glue::WebMediaPlayerImpl* player) OVERRIDE;
-  virtual void PlayerGone(webkit_glue::WebMediaPlayerImpl* player) OVERRIDE;
+  virtual void DidPlay(webkit_media::WebMediaPlayerImpl* player) OVERRIDE;
+  virtual void DidPause(webkit_media::WebMediaPlayerImpl* player) OVERRIDE;
+  virtual void PlayerGone(webkit_media::WebMediaPlayerImpl* player) OVERRIDE;
 
   // Please do not add your stuff randomly to the end here. If there is an
   // appropriate section, add it there. If not, there are some random functions