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

Side by Side 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 unified diff | Download patch
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 "content/renderer/media/crypto/content_decryption_module_factory.h" 5 #include "content/renderer/media/crypto/content_decryption_module_factory.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "content/renderer/media/crypto/key_systems.h" 8 #include "content/renderer/media/crypto/key_systems.h"
9 #include "media/cdm/aes_decryptor.h" 9 #include "media/cdm/aes_decryptor.h"
10 #include "url/gurl.h" 10 #include "url/gurl.h"
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 security_origin, 63 security_origin,
64 manager, 64 manager,
65 session_message_cb, 65 session_message_cb,
66 session_ready_cb, 66 session_ready_cb,
67 session_closed_cb, 67 session_closed_cb,
68 session_error_cb, 68 session_error_cb,
69 session_keys_change_cb, 69 session_keys_change_cb,
70 session_expiration_update_cb); 70 session_expiration_update_cb);
71 if (proxy_media_keys) 71 if (proxy_media_keys)
72 *cdm_id = proxy_media_keys->GetCdmId(); 72 *cdm_id = proxy_media_keys->GetCdmId();
73 return proxy_media_keys.PassAs<media::MediaKeys>(); 73 return proxy_media_keys.Pass();
74 #else 74 #else
75 return scoped_ptr<media::MediaKeys>(); 75 return nullptr;
76 #endif // defined(ENABLE_PEPPER_CDMS) 76 #endif // defined(ENABLE_PEPPER_CDMS)
77 } 77 }
78 78
79 } // namespace content 79 } // namespace content
OLDNEW
« 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