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

Unified Diff: content/renderer/media/crypto/ppapi_decryptor.cc

Issue 657763002: Use scoped_ptr::Pass instead of scoped_ptr::PassAs<T>. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 side-by-side diff with in-line comments
Download patch
Index: content/renderer/media/crypto/ppapi_decryptor.cc
diff --git a/content/renderer/media/crypto/ppapi_decryptor.cc b/content/renderer/media/crypto/ppapi_decryptor.cc
index a61e3aecfa62447cf59f2de49c4631adeb7de4ab..b2b10d7b978d8615b8b075188781fe98328d4e3c 100644
--- a/content/renderer/media/crypto/ppapi_decryptor.cc
+++ b/content/renderer/media/crypto/ppapi_decryptor.cc
@@ -209,9 +209,7 @@ void PpapiDecryptor::LoadSession(
base::Bind(&PpapiDecryptor::ResumePlayback,
weak_ptr_factory_.GetWeakPtr())));
- CdmDelegate()->LoadSession(
- web_session_id,
- session_loaded_promise.PassAs<media::NewSessionCdmPromise>());
+ CdmDelegate()->LoadSession(web_session_id, session_loaded_promise.Pass());
}
void PpapiDecryptor::UpdateSession(
@@ -232,11 +230,10 @@ void PpapiDecryptor::UpdateSession(
new SessionUpdatedPromise(promise.Pass(),
base::Bind(&PpapiDecryptor::ResumePlayback,
weak_ptr_factory_.GetWeakPtr())));
- CdmDelegate()->UpdateSession(
- web_session_id,
- response,
- response_length,
- session_updated_promise.PassAs<media::SimpleCdmPromise>());
+ CdmDelegate()->UpdateSession(web_session_id,
+ response,
+ response_length,
+ session_updated_promise.Pass());
}
void PpapiDecryptor::CloseSession(const std::string& web_session_id,
« no previous file with comments | « content/renderer/media/crypto/content_decryption_module_factory.cc ('k') | content/renderer/media/crypto/proxy_media_keys.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698