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

webkit/media/webmediaplayer_proxy.h

 // Copyright (c) 2011 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 WEBKIT_GLUE_WEBMEDIAPLAYER_PROXY_H_
-#define WEBKIT_GLUE_WEBMEDIAPLAYER_PROXY_H_
+#ifndef WEBKIT_MEDIA_WEBMEDIAPLAYER_PROXY_H_
+#define WEBKIT_MEDIA_WEBMEDIAPLAYER_PROXY_H_
 
 #include <list>
 
 #include "base/memory/ref_counted.h"
 #include "base/synchronization/lock.h"
 #include "media/filters/chunk_demuxer_client.h"
-#include "webkit/glue/media/web_data_source.h"
+#include "webkit/media/web_data_source.h"
 
 class MessageLoop;
 class SkCanvas;
 
 namespace gfx {
 class Rect;
 }
 
-namespace webkit_glue {
+namespace webkit_media {
 
 class WebMediaPlayerImpl;
 class WebVideoRenderer;
 
 // Acts as a thread proxy between the various threads used for multimedia and
 // the render thread that WebMediaPlayerImpl is running on.
 class WebMediaPlayerProxy
     : public base::RefCountedThreadSafe<WebMediaPlayerProxy>,
       public media::ChunkDemuxerClient {
  public:
@@ skipping 75 matching lines @@
   scoped_refptr<WebVideoRenderer> video_renderer_;
 
   base::Lock lock_;
   int outstanding_repaints_;
 
   scoped_refptr<media::ChunkDemuxer> chunk_demuxer_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(WebMediaPlayerProxy);
 };
 
-}  // namespace webkit_glue
+}  // namespace webkit_media
 
-#endif  // WEBKIT_GLUE_WEBMEDIAPLAYER_PROXY_H_
+#endif  // WEBKIT_MEDIA_WEBMEDIAPLAYER_PROXY_H_