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

Side by Side Diff: media/cdm/aes_decryptor_unittest.cc

Issue 22362007: Relocate last remnants of webkit/renderer/media code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Make chromeos crypto dep explicit. Created 7 years, 4 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 | Annotate | Revision Log
« no previous file with comments | « media/cdm/aes_decryptor.cc ('k') | media/cdm/ppapi/DEPS » ('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 #include <string> 5 #include <string>
6 #include <vector> 6 #include <vector>
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "media/base/decoder_buffer.h" 10 #include "media/base/decoder_buffer.h"
11 #include "media/base/decrypt_config.h" 11 #include "media/base/decrypt_config.h"
12 #include "media/base/mock_filters.h" 12 #include "media/base/mock_filters.h"
13 #include "media/crypto/aes_decryptor.h" 13 #include "media/cdm/aes_decryptor.h"
14 #include "media/webm/webm_constants.h" 14 #include "media/webm/webm_constants.h"
15 #include "testing/gmock/include/gmock/gmock.h" 15 #include "testing/gmock/include/gmock/gmock.h"
16 #include "testing/gtest/include/gtest/gtest.h" 16 #include "testing/gtest/include/gtest/gtest.h"
17 17
18 using ::testing::_; 18 using ::testing::_;
19 using ::testing::ElementsAreArray; 19 using ::testing::ElementsAreArray;
20 using ::testing::Gt; 20 using ::testing::Gt;
21 using ::testing::IsNull; 21 using ::testing::IsNull;
22 using ::testing::NotNull; 22 using ::testing::NotNull;
23 using ::testing::SaveArg; 23 using ::testing::SaveArg;
(...skipping 631 matching lines...) Expand 10 before | Expand all | Expand 10 after
655 kEncryptedData, arraysize(kEncryptedData), 655 kEncryptedData, arraysize(kEncryptedData),
656 kSubsampleKeyId, arraysize(kSubsampleKeyId), 656 kSubsampleKeyId, arraysize(kSubsampleKeyId),
657 kSubsampleIv, arraysize(kSubsampleIv), 657 kSubsampleIv, arraysize(kSubsampleIv),
658 0, 658 0,
659 subsample_entries_cypher_only); 659 subsample_entries_cypher_only);
660 ASSERT_NO_FATAL_FAILURE(DecryptAndExpectToSucceed(encrypted_data, 660 ASSERT_NO_FATAL_FAILURE(DecryptAndExpectToSucceed(encrypted_data,
661 kSubsampleOriginalData, kSubsampleOriginalDataSize)); 661 kSubsampleOriginalData, kSubsampleOriginalDataSize));
662 } 662 }
663 663
664 } // namespace media 664 } // namespace media
OLDNEW
« no previous file with comments | « media/cdm/aes_decryptor.cc ('k') | media/cdm/ppapi/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698