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

Unified Diff: media/cdm/ppapi/external_clear_key/cdm_video_decoder.cc

Issue 1915443003: Replace scoped_ptr with std::unique_ptr in //media. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@scopedptr-media-base
Patch Set: scopedptr-media: rebase 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/cdm/ppapi/external_clear_key/cdm_video_decoder.cc
diff --git a/media/cdm/ppapi/external_clear_key/cdm_video_decoder.cc b/media/cdm/ppapi/external_clear_key/cdm_video_decoder.cc
index 8535b14da63a53fb1a92b754618b0ae33ac94e8a..ade64566620fd683423531136dd9f64852455a92 100644
--- a/media/cdm/ppapi/external_clear_key/cdm_video_decoder.cc
+++ b/media/cdm/ppapi/external_clear_key/cdm_video_decoder.cc
@@ -2,7 +2,6 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "base/memory/scoped_ptr.h"
#include "media/cdm/ppapi/external_clear_key/cdm_video_decoder.h"
#if defined(CLEAR_KEY_CDM_USE_FAKE_VIDEO_DECODER)
@@ -19,9 +18,10 @@
namespace media {
-scoped_ptr<CdmVideoDecoder> CreateVideoDecoder(
- ClearKeyCdmHost* host, const cdm::VideoDecoderConfig& config) {
- scoped_ptr<CdmVideoDecoder> video_decoder;
+std::unique_ptr<CdmVideoDecoder> CreateVideoDecoder(
+ ClearKeyCdmHost* host,
+ const cdm::VideoDecoderConfig& config) {
+ std::unique_ptr<CdmVideoDecoder> video_decoder;
#if defined(CLEAR_KEY_CDM_USE_FAKE_VIDEO_DECODER)
video_decoder.reset(new FakeCdmVideoDecoder(host));
« no previous file with comments | « media/cdm/ppapi/external_clear_key/cdm_video_decoder.h ('k') | media/cdm/ppapi/external_clear_key/clear_key_cdm.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698