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

Side by Side Diff: media/test/pipeline_integration_test_base.h

Issue 2568463003: media: Rename MediaKeys to ContentDecryptionModule (Closed)
Patch Set: comments addressed Created 4 years 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/test/pipeline_integration_test.cc ('k') | no next file » | 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_TEST_PIPELINE_INTEGRATION_TEST_BASE_H_ 5 #ifndef MEDIA_TEST_PIPELINE_INTEGRATION_TEST_BASE_H_
6 #define MEDIA_TEST_PIPELINE_INTEGRATION_TEST_BASE_H_ 6 #define MEDIA_TEST_PIPELINE_INTEGRATION_TEST_BASE_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 #include <memory> 9 #include <memory>
10 10
11 #include "base/md5.h" 11 #include "base/md5.h"
12 #include "base/memory/scoped_vector.h" 12 #include "base/memory/scoped_vector.h"
13 #include "base/message_loop/message_loop.h" 13 #include "base/message_loop/message_loop.h"
14 #include "media/audio/clockless_audio_sink.h" 14 #include "media/audio/clockless_audio_sink.h"
15 #include "media/audio/null_audio_sink.h" 15 #include "media/audio/null_audio_sink.h"
16 #include "media/base/demuxer.h" 16 #include "media/base/demuxer.h"
17 #include "media/base/media_keys.h"
18 #include "media/base/null_video_sink.h" 17 #include "media/base/null_video_sink.h"
19 #include "media/base/pipeline_impl.h" 18 #include "media/base/pipeline_impl.h"
20 #include "media/base/pipeline_status.h" 19 #include "media/base/pipeline_status.h"
21 #include "media/base/text_track.h" 20 #include "media/base/text_track.h"
22 #include "media/base/text_track_config.h" 21 #include "media/base/text_track_config.h"
23 #include "media/base/video_frame.h" 22 #include "media/base/video_frame.h"
24 #include "media/renderers/video_renderer_impl.h" 23 #include "media/renderers/video_renderer_impl.h"
25 #include "testing/gmock/include/gmock/gmock.h" 24 #include "testing/gmock/include/gmock/gmock.h"
26 25
27 namespace media { 26 namespace media {
(...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after
204 void(const TextTrackConfig& config, 203 void(const TextTrackConfig& config,
205 const AddTextTrackDoneCB& done_cb)); 204 const AddTextTrackDoneCB& done_cb));
206 MOCK_METHOD0(OnWaitingForDecryptionKey, void(void)); 205 MOCK_METHOD0(OnWaitingForDecryptionKey, void(void));
207 MOCK_METHOD1(OnVideoNaturalSizeChange, void(const gfx::Size&)); 206 MOCK_METHOD1(OnVideoNaturalSizeChange, void(const gfx::Size&));
208 MOCK_METHOD1(OnVideoOpacityChange, void(bool)); 207 MOCK_METHOD1(OnVideoOpacityChange, void(bool));
209 }; 208 };
210 209
211 } // namespace media 210 } // namespace media
212 211
213 #endif // MEDIA_TEST_PIPELINE_INTEGRATION_TEST_BASE_H_ 212 #endif // MEDIA_TEST_PIPELINE_INTEGRATION_TEST_BASE_H_
OLDNEW
« no previous file with comments | « media/test/pipeline_integration_test.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698