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

Unified Diff: media/blink/webcontentdecryptionmoduleaccess_impl.cc

Issue 1904253002: Convert //media/blink from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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: media/blink/webcontentdecryptionmoduleaccess_impl.cc
diff --git a/media/blink/webcontentdecryptionmoduleaccess_impl.cc b/media/blink/webcontentdecryptionmoduleaccess_impl.cc
index 17bb1fb95a7ca0f26ef21f741437dbee36c63b53..34d4a0fce391623ccf5525726cf977a9155c2884 100644
--- a/media/blink/webcontentdecryptionmoduleaccess_impl.cc
+++ b/media/blink/webcontentdecryptionmoduleaccess_impl.cc
@@ -4,11 +4,11 @@
#include "media/blink/webcontentdecryptionmoduleaccess_impl.h"
+#include <memory>
#include <utility>
#include "base/bind.h"
#include "base/location.h"
-#include "base/memory/scoped_ptr.h"
#include "base/single_thread_task_runner.h"
#include "base/thread_task_runner_handle.h"
#include "media/blink/webencryptedmediaclient_impl.h"
@@ -21,7 +21,7 @@ static void CreateCdm(
const blink::WebString& key_system,
const blink::WebSecurityOrigin& security_origin,
const CdmConfig& cdm_config,
- scoped_ptr<blink::WebContentDecryptionModuleResult> result) {
+ std::unique_ptr<blink::WebContentDecryptionModuleResult> result) {
// If |client| is gone (due to the frame getting destroyed), it is
// impossible to create the CDM, so fail.
if (!client) {
@@ -72,7 +72,7 @@ void WebContentDecryptionModuleAccessImpl::createContentDecryptionModule(
// As this object's lifetime is controlled by MediaKeySystemAccess on the
// blink side, copy all values needed by CreateCdm() in case the blink object
// gets garbage-collected.
- scoped_ptr<blink::WebContentDecryptionModuleResult> result_copy(
+ std::unique_ptr<blink::WebContentDecryptionModuleResult> result_copy(
new blink::WebContentDecryptionModuleResult(result));
base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE, base::Bind(&CreateCdm, client_, key_system_, security_origin_,
« no previous file with comments | « media/blink/webcontentdecryptionmodule_impl.cc ('k') | media/blink/webcontentdecryptionmodulesession_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698