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

Unified Diff: media/cdm/aes_decryptor.cc

Issue 1428753010: Add unit tests for CdmAdapter (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: changes for bots Created 5 years, 1 month 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 side-by-side diff with in-line comments
Download patch
Index: media/cdm/aes_decryptor.cc
diff --git a/media/cdm/aes_decryptor.cc b/media/cdm/aes_decryptor.cc
index 8eaa0585fd1cf6a8c282b6dcb3f5482544c25564..66eb9f2294bda7b78135f98f6cc5f371fc6ee95d 100644
--- a/media/cdm/aes_decryptor.cc
+++ b/media/cdm/aes_decryptor.cc
@@ -234,12 +234,14 @@ AesDecryptor::AesDecryptor(const GURL& /* security_origin */,
const SessionKeysChangeCB& session_keys_change_cb)
: session_message_cb_(session_message_cb),
session_closed_cb_(session_closed_cb),
- session_keys_change_cb_(session_keys_change_cb) {
+ session_keys_change_cb_(session_keys_change_cb),
+ empty_gurl_(new GURL()) {
// AesDecryptor doesn't keep any persistent data, so no need to do anything
// with |security_origin|.
DCHECK(!session_message_cb_.is_null());
DCHECK(!session_closed_cb_.is_null());
DCHECK(!session_keys_change_cb_.is_null());
+ DCHECK(empty_gurl_->is_empty());
}
AesDecryptor::~AesDecryptor() {
@@ -310,7 +312,7 @@ void AesDecryptor::CreateSessionAndGenerateRequest(
// No URL needed for license requests.
session_message_cb_.Run(session_id, LICENSE_REQUEST, message,
- GURL::EmptyGURL());
+ *empty_gurl_.get());
xhwang 2015/11/13 00:03:22 Can we just create a local one here? GURL empty_g
jrummell 2015/11/13 00:35:20 Done.
}
void AesDecryptor::LoadSession(SessionType session_type,

Powered by Google App Engine
This is Rietveld 408576698