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

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

Issue 301933002: Changing default_url to destination_url for consistency (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: removing nit Created 6 years, 6 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
« no previous file with comments | « content/renderer/pepper/content_decryptor_delegate.cc ('k') | media/cdm/ppapi/cdm_adapter.h » ('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 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 "media/base/decoder_buffer.h" 10 #include "media/base/decoder_buffer.h"
(...skipping 312 matching lines...) Expand 10 before | Expand all | Expand 10 after
323 EXPECT_TRUE(decrypted_text.empty()); 323 EXPECT_TRUE(decrypted_text.empty());
324 break; 324 break;
325 } 325 }
326 } 326 }
327 327
328 MOCK_METHOD2(OnSessionCreated, 328 MOCK_METHOD2(OnSessionCreated,
329 void(uint32 session_id, const std::string& web_session_id)); 329 void(uint32 session_id, const std::string& web_session_id));
330 MOCK_METHOD3(OnSessionMessage, 330 MOCK_METHOD3(OnSessionMessage,
331 void(uint32 session_id, 331 void(uint32 session_id,
332 const std::vector<uint8>& message, 332 const std::vector<uint8>& message,
333 const GURL& default_url)); 333 const GURL& destination_url));
334 MOCK_METHOD1(OnSessionReady, void(uint32 session_id)); 334 MOCK_METHOD1(OnSessionReady, void(uint32 session_id));
335 MOCK_METHOD1(OnSessionClosed, void(uint32 session_id)); 335 MOCK_METHOD1(OnSessionClosed, void(uint32 session_id));
336 MOCK_METHOD3(OnSessionError, 336 MOCK_METHOD3(OnSessionError,
337 void(uint32 session_id, 337 void(uint32 session_id,
338 MediaKeys::KeyError, 338 MediaKeys::KeyError,
339 uint32 system_code)); 339 uint32 system_code));
340 340
341 AesDecryptor decryptor_; 341 AesDecryptor decryptor_;
342 AesDecryptor::DecryptCB decrypt_cb_; 342 AesDecryptor::DecryptCB decrypt_cb_;
343 343
(...skipping 416 matching lines...) Expand 10 before | Expand all | Expand 10 after
760 " \"kid\": \"\"," 760 " \"kid\": \"\","
761 " \"k\": \"BAUGBwgJCgsMDQ4PEBESEw\"" 761 " \"k\": \"BAUGBwgJCgsMDQ4PEBESEw\""
762 " }" 762 " }"
763 " ]" 763 " ]"
764 "}"; 764 "}";
765 UpdateSessionAndExpect(session_id, kJwksWithEmptyKeyId, SESSION_ERROR); 765 UpdateSessionAndExpect(session_id, kJwksWithEmptyKeyId, SESSION_ERROR);
766 ReleaseSession(session_id); 766 ReleaseSession(session_id);
767 } 767 }
768 768
769 } // namespace media 769 } // namespace media
OLDNEW
« no previous file with comments | « content/renderer/pepper/content_decryptor_delegate.cc ('k') | media/cdm/ppapi/cdm_adapter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698