| Index: content/renderer/media/buffered_data_source.h
|
| diff --git a/webkit/renderer/media/buffered_data_source.h b/content/renderer/media/buffered_data_source.h
|
| similarity index 94%
|
| rename from webkit/renderer/media/buffered_data_source.h
|
| rename to content/renderer/media/buffered_data_source.h
|
| index eda3cb2c2f606d30331923319d58308eb728c296..6161001883442eb64e4bb49b4d1a6f0048916629 100644
|
| --- a/webkit/renderer/media/buffered_data_source.h
|
| +++ b/content/renderer/media/buffered_data_source.h
|
| @@ -2,19 +2,20 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef WEBKIT_RENDERER_MEDIA_BUFFERED_DATA_SOURCE_H_
|
| -#define WEBKIT_RENDERER_MEDIA_BUFFERED_DATA_SOURCE_H_
|
| +#ifndef CONTENT_RENDERER_MEDIA_BUFFERED_DATA_SOURCE_H_
|
| +#define CONTENT_RENDERER_MEDIA_BUFFERED_DATA_SOURCE_H_
|
|
|
| #include <string>
|
|
|
| #include "base/callback.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/synchronization/lock.h"
|
| +#include "content/common/content_export.h"
|
| +#include "content/renderer/media/buffered_resource_loader.h"
|
| +#include "content/renderer/media/preload.h"
|
| #include "googleurl/src/gurl.h"
|
| #include "media/base/data_source.h"
|
| #include "media/base/ranges.h"
|
| -#include "webkit/renderer/media/buffered_resource_loader.h"
|
| -#include "webkit/renderer/media/preload.h"
|
|
|
| namespace base {
|
| class MessageLoopProxy;
|
| @@ -24,14 +25,14 @@ namespace media {
|
| class MediaLog;
|
| }
|
|
|
| -namespace webkit_media {
|
| +namespace content {
|
|
|
| // A data source capable of loading URLs and buffering the data using an
|
| // in-memory sliding window.
|
| //
|
| // BufferedDataSource must be created and initialized on the render thread
|
| // before being passed to other threads. It may be deleted on any thread.
|
| -class BufferedDataSource : public media::DataSource {
|
| +class CONTENT_EXPORT BufferedDataSource : public media::DataSource {
|
| public:
|
| typedef base::Callback<void(bool)> DownloadingCB;
|
|
|
| @@ -215,6 +216,6 @@ class BufferedDataSource : public media::DataSource {
|
| DISALLOW_COPY_AND_ASSIGN(BufferedDataSource);
|
| };
|
|
|
| -} // namespace webkit_media
|
| +} // namespace content
|
|
|
| -#endif // WEBKIT_RENDERER_MEDIA_BUFFERED_DATA_SOURCE_H_
|
| +#endif // CONTENT_RENDERER_MEDIA_BUFFERED_DATA_SOURCE_H_
|
|
|