| Index: media/blink/buffered_data_source_host_impl.h
|
| diff --git a/content/renderer/media/buffered_data_source_host_impl.h b/media/blink/buffered_data_source_host_impl.h
|
| similarity index 71%
|
| rename from content/renderer/media/buffered_data_source_host_impl.h
|
| rename to media/blink/buffered_data_source_host_impl.h
|
| index d04d4671cc5ea216e38e525c8441beaed20071f0..fde5bb2eedac4c3ad982f8948620a4ce5acb153c 100644
|
| --- a/content/renderer/media/buffered_data_source_host_impl.h
|
| +++ b/media/blink/buffered_data_source_host_impl.h
|
| @@ -2,19 +2,19 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef CONTENT_RENDERER_MEDIA_BUFFERED_DATA_SOURCE_HOST_IMPL_H_
|
| -#define CONTENT_RENDERER_MEDIA_BUFFERED_DATA_SOURCE_HOST_IMPL_H_
|
| +#ifndef MEDIA_BLINK_BUFFERED_DATA_SOURCE_HOST_IMPL_H_
|
| +#define MEDIA_BLINK_BUFFERED_DATA_SOURCE_HOST_IMPL_H_
|
|
|
| #include "base/time/time.h"
|
| -#include "content/common/content_export.h"
|
| -#include "content/renderer/media/buffered_data_source.h"
|
| +#include "media/base/media_export.h"
|
| #include "media/base/ranges.h"
|
| +#include "media/blink/buffered_data_source.h"
|
|
|
| -namespace content {
|
| +namespace media {
|
|
|
| // Provides an implementation of BufferedDataSourceHost that translates the
|
| // buffered byte ranges into estimated time ranges.
|
| -class CONTENT_EXPORT BufferedDataSourceHostImpl
|
| +class MEDIA_EXPORT BufferedDataSourceHostImpl
|
| : public BufferedDataSourceHost {
|
| public:
|
| BufferedDataSourceHostImpl();
|
| @@ -27,7 +27,7 @@ class CONTENT_EXPORT BufferedDataSourceHostImpl
|
| // Translate the byte ranges to time ranges and append them to the list.
|
| // TODO(sandersd): This is a confusing name, find something better.
|
| void AddBufferedTimeRanges(
|
| - media::Ranges<base::TimeDelta>* buffered_time_ranges,
|
| + Ranges<base::TimeDelta>* buffered_time_ranges,
|
| base::TimeDelta media_duration) const;
|
|
|
| bool DidLoadingProgress();
|
| @@ -37,7 +37,7 @@ class CONTENT_EXPORT BufferedDataSourceHostImpl
|
| int64 total_bytes_;
|
|
|
| // List of buffered byte ranges for estimating buffered time.
|
| - media::Ranges<int64> buffered_byte_ranges_;
|
| + Ranges<int64> buffered_byte_ranges_;
|
|
|
| // True when AddBufferedByteRange() has been called more recently than
|
| // DidLoadingProgress().
|
| @@ -46,6 +46,6 @@ class CONTENT_EXPORT BufferedDataSourceHostImpl
|
| DISALLOW_COPY_AND_ASSIGN(BufferedDataSourceHostImpl);
|
| };
|
|
|
| -} // namespace content
|
| +} // namespace media
|
|
|
| -#endif // CONTENT_RENDERER_MEDIA_BUFFERED_DATA_SOURCE_HOST_IMPL_H_
|
| +#endif // MEDIA_BLINK_BUFFERED_DATA_SOURCE_HOST_IMPL_H_
|
|
|