| 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)
|
| }
|
|
|
|
|