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

Unified Diff: content/renderer/media/crypto/content_decryption_module_factory.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/content_decryption_module_factory.cc
diff --git a/content/renderer/media/crypto/content_decryption_module_factory.cc b/content/renderer/media/crypto/content_decryption_module_factory.cc
index 07302388d4531768fc42444d0c7efd7bd68c2970..45db511c5247d5d3df2e8bb596a1e9fa41c4fdc7 100644
--- a/content/renderer/media/crypto/content_decryption_module_factory.cc
+++ b/content/renderer/media/crypto/content_decryption_module_factory.cc
@@ -70,9 +70,9 @@ scoped_ptr<media::MediaKeys> ContentDecryptionModuleFactory::Create(
session_expiration_update_cb);
if (proxy_media_keys)
*cdm_id = proxy_media_keys->GetCdmId();
- return proxy_media_keys.PassAs<media::MediaKeys>();
+ return proxy_media_keys.Pass();
#else
- return scoped_ptr<media::MediaKeys>();
+ return nullptr;
#endif // defined(ENABLE_PEPPER_CDMS)
}
« no previous file with comments | « content/renderer/java/gin_java_bridge_value_converter.cc ('k') | content/renderer/media/crypto/ppapi_decryptor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698