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

Side by Side Diff: webkit/media/crypto/proxy_decryptor_unittest.cc

Issue 10825194: Change Deryptor::DecryptStatus and VideoDecoder::DecoderStatus to *::Status. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 8 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 | « webkit/media/crypto/proxy_decryptor.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 #include "webkit/media/crypto/proxy_decryptor.h" 5 #include "webkit/media/crypto/proxy_decryptor.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/memory/ref_counted.h" 9 #include "base/memory/ref_counted.h"
10 #include "base/message_loop.h" 10 #include "base/message_loop.h"
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 EXPECT_CALL(*real_decryptor_, AddKey(kFakeKeySystem, 90 EXPECT_CALL(*real_decryptor_, AddKey(kFakeKeySystem,
91 kFakeKeyId, arraysize(kFakeKeyId), 91 kFakeKeyId, arraysize(kFakeKeyId),
92 kFakeKey, arraysize(kFakeKey), 92 kFakeKey, arraysize(kFakeKey),
93 kFakeSessionId)); 93 kFakeSessionId));
94 proxy_decryptor_.AddKey(kFakeKeySystem, 94 proxy_decryptor_.AddKey(kFakeKeySystem,
95 kFakeKeyId, arraysize(kFakeKeyId), 95 kFakeKeyId, arraysize(kFakeKeyId),
96 kFakeKey, arraysize(kFakeKey), 96 kFakeKey, arraysize(kFakeKey),
97 kFakeSessionId); 97 kFakeSessionId);
98 } 98 }
99 99
100 MOCK_METHOD2(BufferDecrypted, void(Decryptor::DecryptStatus, 100 MOCK_METHOD2(BufferDecrypted, void(Decryptor::Status,
101 const scoped_refptr<DecoderBuffer>&)); 101 const scoped_refptr<DecoderBuffer>&));
102 102
103 protected: 103 protected:
104 MessageLoop message_loop_; 104 MessageLoop message_loop_;
105 media::MockDecryptorClient client_; 105 media::MockDecryptorClient client_;
106 ProxyDecryptor proxy_decryptor_; 106 ProxyDecryptor proxy_decryptor_;
107 media::MockDecryptor* real_decryptor_; 107 media::MockDecryptor* real_decryptor_;
108 scoped_refptr<DecoderBuffer> encrypted_buffer_; 108 scoped_refptr<DecoderBuffer> encrypted_buffer_;
109 scoped_refptr<DecoderBuffer> decrypted_buffer_; 109 scoped_refptr<DecoderBuffer> decrypted_buffer_;
110 scoped_refptr<DecoderBuffer> null_buffer_; 110 scoped_refptr<DecoderBuffer> null_buffer_;
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
220 EXPECT_CALL(*real_decryptor_, Stop()); 220 EXPECT_CALL(*real_decryptor_, Stop());
221 EXPECT_CALL(*this, BufferDecrypted(Decryptor::kError, null_buffer_)) 221 EXPECT_CALL(*this, BufferDecrypted(Decryptor::kError, null_buffer_))
222 .Times(3); 222 .Times(3);
223 proxy_decryptor_.Stop(); 223 proxy_decryptor_.Stop();
224 224
225 message_loop_.PostTask(FROM_HERE, MessageLoop::QuitClosure()); 225 message_loop_.PostTask(FROM_HERE, MessageLoop::QuitClosure());
226 message_loop_.Run(); 226 message_loop_.Run();
227 } 227 }
228 228
229 } // namespace webkit_media 229 } // namespace webkit_media
OLDNEW
« no previous file with comments | « webkit/media/crypto/proxy_decryptor.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698