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

webkit/media/buffered_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/buffered_data_source.h"
+#include "webkit/media/buffered_data_source.h"
 
 #include "base/bind.h"
 #include "media/base/filter_host.h"
 #include "media/base/media_log.h"
 #include "net/base/net_errors.h"
-#include "webkit/glue/media/web_data_source_factory.h"
+#include "webkit/media/web_data_source_factory.h"
 #include "webkit/glue/webkit_glue.h"
 
 using WebKit::WebFrame;
 
-namespace webkit_glue {
+namespace webkit_media {
 
 // BufferedDataSource has an intermediate buffer, this value governs the initial
 // size of that buffer. It is set to 32KB because this is a typical read size
 // of FFmpeg.
 static const int kInitialReadBufferSize = 32768;
 
 // Number of cache misses we allow for a single Read() before signalling an
 // error.
 static const int kNumCacheMissRetries = 3;
 
@@ skipping 71 matching lines @@
 
 void BufferedDataSource::Initialize(const std::string& url,
                                     const media::PipelineStatusCB& callback) {
   // Saves the url.
   url_ = GURL(url);
 
   // This data source doesn't support data:// protocol so reject it.
   if (url_.SchemeIs(kDataScheme)) {
     callback.Run(media::DATASOURCE_ERROR_URL_NOT_SUPPORTED);
     return;
-  } else if (!IsProtocolSupportedForMedia(url_)) {
+  } else if (!webkit_glue::IsProtocolSupportedForMedia(url_)) {
     callback.Run(media::PIPELINE_ERROR_NETWORK);
     return;
   }
 
   DCHECK(!callback.is_null());
   {
     base::AutoLock auto_lock(lock_);
     initialize_cb_ = callback;
   }
 
@@ skipping 543 matching lines @@
   filter_host->SetLoaded(loaded_);
 
   if (streaming_) {
     filter_host->SetStreaming(true);
   } else {
     filter_host->SetTotalBytes(total_bytes_);
     filter_host->SetBufferedBytes(buffered_bytes_);
   }
 }
 
-}  // namespace webkit_glue
+}  // namespace webkit_media