Replace scoped_ptr with std::unique_ptr in //media.

media/cdm/simple_cdm_allocator.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/cdm/simple_cdm_allocator.h"
 
+#include "base/memory/ptr_util.h"
 #include "media/base/video_frame.h"
 #include "media/cdm/cdm_helpers.h"
 #include "media/cdm/simple_cdm_buffer.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/size.h"
 
 namespace media {
 
 namespace {
 
@@ skipping 42 matching lines @@
 // the memory allocated, so the caller is responsible for calling Destroy()
 // on the buffer when it is no longer needed.
 cdm::Buffer* SimpleCdmAllocator::CreateCdmBuffer(size_t capacity) {
   if (!capacity)
     return nullptr;
 
   return SimpleCdmBuffer::Create(capacity);
 }
 
 // Creates a new SimpleCdmVideoFrame on every request.
-scoped_ptr<VideoFrameImpl> SimpleCdmAllocator::CreateCdmVideoFrame() {
-  return make_scoped_ptr(new SimpleCdmVideoFrame());
+std::unique_ptr<VideoFrameImpl> SimpleCdmAllocator::CreateCdmVideoFrame() {
+  return base::WrapUnique(new SimpleCdmVideoFrame());
 }
 
 }  // namespace media