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

Side by Side Diff: media/base/fake_text_track_stream.h

Issue 623263003: replace OVERRIDE and FINAL with override and final in media/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 unified diff | Download patch
« no previous file with comments | « media/base/fake_audio_renderer_sink.h ('k') | media/base/mock_audio_renderer_sink.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/message_loop/message_loop.h" 5 #include "base/message_loop/message_loop.h"
6 #include "media/base/audio_decoder_config.h" 6 #include "media/base/audio_decoder_config.h"
7 #include "media/base/demuxer_stream.h" 7 #include "media/base/demuxer_stream.h"
8 #include "media/base/video_decoder_config.h" 8 #include "media/base/video_decoder_config.h"
9 #include "testing/gmock/include/gmock/gmock.h" 9 #include "testing/gmock/include/gmock/gmock.h"
10 10
11 namespace media { 11 namespace media {
12 12
13 // Fake implementation of the DemuxerStream. These are the stream objects 13 // Fake implementation of the DemuxerStream. These are the stream objects
14 // we pass to the text renderer object when streams are added and removed. 14 // we pass to the text renderer object when streams are added and removed.
15 class FakeTextTrackStream : public DemuxerStream { 15 class FakeTextTrackStream : public DemuxerStream {
16 public: 16 public:
17 FakeTextTrackStream(); 17 FakeTextTrackStream();
18 virtual ~FakeTextTrackStream(); 18 virtual ~FakeTextTrackStream();
19 19
20 // DemuxerStream implementation. 20 // DemuxerStream implementation.
21 virtual void Read(const ReadCB&) OVERRIDE; 21 virtual void Read(const ReadCB&) override;
22 MOCK_METHOD0(audio_decoder_config, AudioDecoderConfig()); 22 MOCK_METHOD0(audio_decoder_config, AudioDecoderConfig());
23 MOCK_METHOD0(video_decoder_config, VideoDecoderConfig()); 23 MOCK_METHOD0(video_decoder_config, VideoDecoderConfig());
24 virtual Type type() OVERRIDE; 24 virtual Type type() override;
25 MOCK_METHOD0(EnableBitstreamConverter, void()); 25 MOCK_METHOD0(EnableBitstreamConverter, void());
26 virtual bool SupportsConfigChanges(); 26 virtual bool SupportsConfigChanges();
27 virtual VideoRotation video_rotation() OVERRIDE; 27 virtual VideoRotation video_rotation() override;
28 28
29 void SatisfyPendingRead(const base::TimeDelta& start, 29 void SatisfyPendingRead(const base::TimeDelta& start,
30 const base::TimeDelta& duration, 30 const base::TimeDelta& duration,
31 const std::string& id, 31 const std::string& id,
32 const std::string& content, 32 const std::string& content,
33 const std::string& settings); 33 const std::string& settings);
34 void AbortPendingRead(); 34 void AbortPendingRead();
35 void SendEosNotification(); 35 void SendEosNotification();
36 36
37 void Stop(); 37 void Stop();
38 38
39 MOCK_METHOD0(OnRead, void()); 39 MOCK_METHOD0(OnRead, void());
40 40
41 private: 41 private:
42 scoped_refptr<base::SingleThreadTaskRunner> task_runner_; 42 scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
43 ReadCB read_cb_; 43 ReadCB read_cb_;
44 bool stopping_; 44 bool stopping_;
45 45
46 DISALLOW_COPY_AND_ASSIGN(FakeTextTrackStream); 46 DISALLOW_COPY_AND_ASSIGN(FakeTextTrackStream);
47 }; 47 };
48 48
49 } // namespace media 49 } // namespace media
OLDNEW
« no previous file with comments | « media/base/fake_audio_renderer_sink.h ('k') | media/base/mock_audio_renderer_sink.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698