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