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

webkit/media/simple_data_source.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.
 
 // An extremely simple implementation of DataSource that downloads the entire
 // media resource into memory before signaling that initialization has finished.
 // Primarily used to test <audio> and <video> with buffering/caching removed
 // from the equation.
 
-#ifndef WEBKIT_GLUE_MEDIA_SIMPLE_DATA_SOURCE_H_
-#define WEBKIT_GLUE_MEDIA_SIMPLE_DATA_SOURCE_H_
+#ifndef WEBKIT_MEDIA_SIMPLE_DATA_SOURCE_H_
+#define WEBKIT_MEDIA_SIMPLE_DATA_SOURCE_H_
 
 #include <algorithm>
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "media/base/filter_factories.h"
 #include "media/base/filters.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURLLoader.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURLLoaderClient.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURLRequest.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURLResponse.h"
-#include "webkit/glue/media/web_data_source.h"
+#include "webkit/media/web_data_source.h"
 
 class MessageLoop;
 class WebMediaPlayerDelegateImpl;
 
 namespace media {
 class MediaLog;
 }
 
-namespace webkit_glue {
+namespace webkit_media {
 
 class SimpleDataSource
     : public WebDataSource,
       public WebKit::WebURLLoaderClient {
  public:
   // Creates a DataSourceFactory for building SimpleDataSource objects.
   static media::DataSourceFactory* CreateFactory(
       MessageLoop* render_loop,
       WebKit::WebFrame* frame,
       media::MediaLog* media_log,
@@ skipping 95 matching lines @@
 
   // Filter callbacks.
   media::PipelineStatusCB initialize_cb_;
 
   // Used to ensure mocks for unittests are used instead of reset in Start().
   bool keep_test_loader_;
 
   DISALLOW_COPY_AND_ASSIGN(SimpleDataSource);
 };
 
-}  // namespace webkit_glue
+}  // namespace webkit_media
 
-#endif  // WEBKIT_GLUE_MEDIA_SIMPLE_DATA_SOURCE_H_
+#endif  // WEBKIT_MEDIA_SIMPLE_DATA_SOURCE_H_