OLD | NEW |
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 <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 "base/json/json_reader.h" | 10 #include "base/json/json_reader.h" |
(...skipping 361 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
372 break; | 372 break; |
373 case NO_KEY: | 373 case NO_KEY: |
374 EXPECT_CALL(*this, BufferDecrypted(Decryptor::kNoKey, IsNull())) | 374 EXPECT_CALL(*this, BufferDecrypted(Decryptor::kNoKey, IsNull())) |
375 .WillOnce(SaveArg<1>(&decrypted)); | 375 .WillOnce(SaveArg<1>(&decrypted)); |
376 break; | 376 break; |
377 } | 377 } |
378 | 378 |
379 decryptor_.Decrypt(Decryptor::kVideo, encrypted, decrypt_cb_); | 379 decryptor_.Decrypt(Decryptor::kVideo, encrypted, decrypt_cb_); |
380 | 380 |
381 std::vector<uint8> decrypted_text; | 381 std::vector<uint8> decrypted_text; |
382 if (decrypted && decrypted->data_size()) { | 382 if (decrypted.get() && decrypted->data_size()) { |
383 decrypted_text.assign( | 383 decrypted_text.assign( |
384 decrypted->data(), decrypted->data() + decrypted->data_size()); | 384 decrypted->data(), decrypted->data() + decrypted->data_size()); |
385 } | 385 } |
386 | 386 |
387 switch (result) { | 387 switch (result) { |
388 case SUCCESS: | 388 case SUCCESS: |
389 EXPECT_EQ(plain_text, decrypted_text); | 389 EXPECT_EQ(plain_text, decrypted_text); |
390 break; | 390 break; |
391 case DATA_MISMATCH: | 391 case DATA_MISMATCH: |
392 EXPECT_EQ(plain_text.size(), decrypted_text.size()); | 392 EXPECT_EQ(plain_text.size(), decrypted_text.size()); |
(...skipping 467 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
860 EXPECT_FALSE(UsableKeyIdsContains(key_id2)); | 860 EXPECT_FALSE(UsableKeyIdsContains(key_id2)); |
861 | 861 |
862 // Add second key, verify both IDs returned. | 862 // Add second key, verify both IDs returned. |
863 UpdateSessionAndExpect(session_id, kKey2AsJWK, RESOLVED); | 863 UpdateSessionAndExpect(session_id, kKey2AsJWK, RESOLVED); |
864 GetUsableKeyIdsAndExpect(session_id, RESOLVED, 2); | 864 GetUsableKeyIdsAndExpect(session_id, RESOLVED, 2); |
865 EXPECT_TRUE(UsableKeyIdsContains(key_id1)); | 865 EXPECT_TRUE(UsableKeyIdsContains(key_id1)); |
866 EXPECT_TRUE(UsableKeyIdsContains(key_id2)); | 866 EXPECT_TRUE(UsableKeyIdsContains(key_id2)); |
867 } | 867 } |
868 | 868 |
869 } // namespace media | 869 } // namespace media |
OLD | NEW |