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

Side by Side Diff: media/remoting/rpc/proto_utils_unittest.cc

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/remoting/rpc/proto_utils.cc ('k') | media/test/pipeline_integration_test.cc » ('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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 "media/remoting/rpc/proto_utils.h" 5 #include "media/remoting/rpc/proto_utils.h"
6 6
7 #include <memory> 7 #include <memory>
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
11 11
12 #include "base/macros.h" 12 #include "base/macros.h"
13 #include "base/memory/ref_counted.h" 13 #include "base/memory/ref_counted.h"
14 #include "media/base/audio_decoder_config.h" 14 #include "media/base/audio_decoder_config.h"
15 #include "media/base/cdm_config.h" 15 #include "media/base/cdm_config.h"
16 #include "media/base/cdm_key_information.h" 16 #include "media/base/cdm_key_information.h"
17 #include "media/base/content_decryption_module.h"
17 #include "media/base/decoder_buffer.h" 18 #include "media/base/decoder_buffer.h"
18 #include "media/base/demuxer_stream.h" 19 #include "media/base/demuxer_stream.h"
19 #include "media/base/eme_constants.h" 20 #include "media/base/eme_constants.h"
20 #include "media/base/media_keys.h"
21 #include "media/base/video_decoder_config.h" 21 #include "media/base/video_decoder_config.h"
22 #include "media/remoting/remoting_rpc_message.pb.h" 22 #include "media/remoting/remoting_rpc_message.pb.h"
23 #include "testing/gmock/include/gmock/gmock.h" 23 #include "testing/gmock/include/gmock/gmock.h"
24 #include "testing/gtest/include/gtest/gtest.h" 24 #include "testing/gtest/include/gtest/gtest.h"
25 25
26 using testing::_; 26 using testing::_;
27 using testing::Invoke; 27 using testing::Invoke;
28 using testing::Return; 28 using testing::Return;
29 29
30 namespace media { 30 namespace media {
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
157 for (uint32_t i = 0; i < 3; i++) { 157 for (uint32_t i = 0; i < 3; i++) {
158 ASSERT_EQ(keys_information[i]->key_id, key_output_information[i]->key_id); 158 ASSERT_EQ(keys_information[i]->key_id, key_output_information[i]->key_id);
159 ASSERT_EQ(keys_information[i]->status, key_output_information[i]->status); 159 ASSERT_EQ(keys_information[i]->status, key_output_information[i]->status);
160 ASSERT_EQ(keys_information[i]->system_code, 160 ASSERT_EQ(keys_information[i]->system_code,
161 key_output_information[i]->system_code); 161 key_output_information[i]->system_code);
162 } 162 }
163 } 163 }
164 164
165 } // namespace remoting 165 } // namespace remoting
166 } // namespace media 166 } // namespace media
OLDNEW
« no previous file with comments | « media/remoting/rpc/proto_utils.cc ('k') | media/test/pipeline_integration_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698