Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(469)

Unified Diff: media/remoting/fake_media_resource.h

Issue 2668393002: Rename DemuxerStreamProvider into MediaResource (Closed)
Patch Set: rebase Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: media/remoting/fake_media_resource.h
diff --git a/media/remoting/fake_demuxer_stream_provider.h b/media/remoting/fake_media_resource.h
similarity index 79%
rename from media/remoting/fake_demuxer_stream_provider.h
rename to media/remoting/fake_media_resource.h
index dfebff96b1b5c3990bc1e8701dc113f8178ae31d..1132b5b02652e71efad8530417a9bb67e6bdd5ad 100644
--- a/media/remoting/fake_demuxer_stream_provider.h
+++ b/media/remoting/fake_media_resource.h
@@ -2,14 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef MEDIA_REMOTING_FAKE_DEMUXER_STREAM_PROVIDER_H_
-#define MEDIA_REMOTING_FAKE_DEMUXER_STREAM_PROVIDER_H_
+#ifndef MEDIA_REMOTING_FAKE_MEDIA_RESOURCE_H_
+#define MEDIA_REMOTING_FAKE_MEDIA_RESOURCE_H_
#include <deque>
#include "media/base/audio_decoder_config.h"
#include "media/base/demuxer_stream.h"
-#include "media/base/demuxer_stream_provider.h"
+#include "media/base/media_resource.h"
#include "media/base/video_decoder_config.h"
#include "testing/gmock/include/gmock/gmock.h"
@@ -49,21 +49,21 @@ class FakeDemuxerStream : public DemuxerStream {
};
// Audio only demuxer stream provider
-class FakeDemuxerStreamProvider : public DemuxerStreamProvider {
+class FakeMediaResource : public MediaResource {
public:
- FakeDemuxerStreamProvider();
- ~FakeDemuxerStreamProvider() final;
+ FakeMediaResource();
+ ~FakeMediaResource() final;
- // DemuxerStreamProvider implementation.
+ // MediaResource implementation.
DemuxerStream* GetStream(DemuxerStream::Type type) override;
private:
std::unique_ptr<FakeDemuxerStream> demuxer_stream_;
- DISALLOW_COPY_AND_ASSIGN(FakeDemuxerStreamProvider);
+ DISALLOW_COPY_AND_ASSIGN(FakeMediaResource);
};
} // namespace remoting
} // namespace media
-#endif // MEDIA_REMOTING_FAKE_DEMUXER_STREAM_PROVIDER_H_
+#endif // MEDIA_REMOTING_FAKE_MEDIA_RESOURCE_H_

Powered by Google App Engine
This is Rietveld 408576698