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

webkit/media/simple_data_source.cc

 // 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.
 
-#include "webkit/glue/media/simple_data_source.h"
+#include "webkit/media/simple_data_source.h"
 
 #include "base/bind.h"
 #include "base/message_loop.h"
 #include "base/process_util.h"
 #include "media/base/filter_host.h"
 #include "media/base/media_log.h"
 #include "net/base/data_url.h"
 #include "net/base/load_flags.h"
 #include "net/http/http_request_headers.h"
 #include "net/url_request/url_request_status.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKitPlatformSupport.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURLLoaderOptions.h"
-#include "webkit/glue/media/web_data_source_factory.h"
 #include "webkit/glue/webkit_glue.h"
+#include "webkit/media/web_data_source_factory.h"
 
 using WebKit::WebString;
 using WebKit::WebURLLoaderOptions;
 
-namespace webkit_glue {
+namespace webkit_media {
 
 static const char kDataScheme[] = "data";
 
 static WebDataSource* NewSimpleDataSource(MessageLoop* render_loop,
                                           WebKit::WebFrame* frame,
                                           media::MediaLog* media_log) {
   return new SimpleDataSource(render_loop, frame);
 }
 
 // static
@@ skipping 52 matching lines @@
   scoped_refptr<SimpleDataSource> destruction_guard(this);
   {
     base::AutoLock auto_lock(lock_);
     DCHECK_EQ(state_, UNINITIALIZED);
     DCHECK(!callback.is_null());
     state_ = INITIALIZING;
     initialize_cb_ = callback;
 
     // Validate the URL.
     url_ = GURL(url);
-    if (!url_.is_valid() || !IsProtocolSupportedForMedia(url_)) {
+    if (!url_.is_valid() || !webkit_glue::IsProtocolSupportedForMedia(url_)) {
       DoneInitialization_Locked(false);
       return;
     }
 
     // Post a task to the render thread to start loading the resource.
     render_loop_->PostTask(FROM_HERE,
         base::Bind(&SimpleDataSource::StartTask, this));
   }
 }
 
@@ skipping 241 matching lines @@
 
 void SimpleDataSource::UpdateHostState() {
   if (host()) {
     host()->SetTotalBytes(size_);
     host()->SetBufferedBytes(size_);
     // If scheme is file or data, say we are loaded.
     host()->SetLoaded(url_.SchemeIsFile() || url_.SchemeIs(kDataScheme));
   }
 }
 
-}  // namespace webkit_glue
+}  // namespace webkit_media