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

Side by Side Diff: media/base/mock_filters.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/mock_audio_renderer_sink.h ('k') | media/base/pipeline.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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #ifndef MEDIA_BASE_MOCK_FILTERS_H_ 5 #ifndef MEDIA_BASE_MOCK_FILTERS_H_
6 #define MEDIA_BASE_MOCK_FILTERS_H_ 6 #define MEDIA_BASE_MOCK_FILTERS_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/callback.h" 10 #include "base/callback.h"
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 private: 46 private:
47 DISALLOW_COPY_AND_ASSIGN(MockDemuxer); 47 DISALLOW_COPY_AND_ASSIGN(MockDemuxer);
48 }; 48 };
49 49
50 class MockDemuxerStream : public DemuxerStream { 50 class MockDemuxerStream : public DemuxerStream {
51 public: 51 public:
52 explicit MockDemuxerStream(DemuxerStream::Type type); 52 explicit MockDemuxerStream(DemuxerStream::Type type);
53 virtual ~MockDemuxerStream(); 53 virtual ~MockDemuxerStream();
54 54
55 // DemuxerStream implementation. 55 // DemuxerStream implementation.
56 virtual Type type() OVERRIDE; 56 virtual Type type() override;
57 MOCK_METHOD1(Read, void(const ReadCB& read_cb)); 57 MOCK_METHOD1(Read, void(const ReadCB& read_cb));
58 virtual AudioDecoderConfig audio_decoder_config() OVERRIDE; 58 virtual AudioDecoderConfig audio_decoder_config() override;
59 virtual VideoDecoderConfig video_decoder_config() OVERRIDE; 59 virtual VideoDecoderConfig video_decoder_config() override;
60 MOCK_METHOD0(EnableBitstreamConverter, void()); 60 MOCK_METHOD0(EnableBitstreamConverter, void());
61 MOCK_METHOD0(SupportsConfigChanges, bool()); 61 MOCK_METHOD0(SupportsConfigChanges, bool());
62 62
63 void set_audio_decoder_config(const AudioDecoderConfig& config); 63 void set_audio_decoder_config(const AudioDecoderConfig& config);
64 void set_video_decoder_config(const VideoDecoderConfig& config); 64 void set_video_decoder_config(const VideoDecoderConfig& config);
65 65
66 virtual VideoRotation video_rotation() OVERRIDE; 66 virtual VideoRotation video_rotation() override;
67 67
68 private: 68 private:
69 DemuxerStream::Type type_; 69 DemuxerStream::Type type_;
70 AudioDecoderConfig audio_decoder_config_; 70 AudioDecoderConfig audio_decoder_config_;
71 VideoDecoderConfig video_decoder_config_; 71 VideoDecoderConfig video_decoder_config_;
72 72
73 DISALLOW_COPY_AND_ASSIGN(MockDemuxerStream); 73 DISALLOW_COPY_AND_ASSIGN(MockDemuxerStream);
74 }; 74 };
75 75
76 class MockVideoDecoder : public VideoDecoder { 76 class MockVideoDecoder : public VideoDecoder {
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after
238 MOCK_METHOD1(ResetDecoder, void(StreamType stream_type)); 238 MOCK_METHOD1(ResetDecoder, void(StreamType stream_type));
239 MOCK_METHOD1(DeinitializeDecoder, void(StreamType stream_type)); 239 MOCK_METHOD1(DeinitializeDecoder, void(StreamType stream_type));
240 240
241 private: 241 private:
242 DISALLOW_COPY_AND_ASSIGN(MockDecryptor); 242 DISALLOW_COPY_AND_ASSIGN(MockDecryptor);
243 }; 243 };
244 244
245 } // namespace media 245 } // namespace media
246 246
247 #endif // MEDIA_BASE_MOCK_FILTERS_H_ 247 #endif // MEDIA_BASE_MOCK_FILTERS_H_
OLDNEW
« no previous file with comments | « media/base/mock_audio_renderer_sink.h ('k') | media/base/pipeline.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698