Convert //extensions/browser from scoped_ptr to std::unique_ptr

extensions/browser/mojo/stash_backend.cc

 // Copyright 2014 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 "extensions/browser/mojo/stash_backend.h"
 
 #include <stddef.h>
 
 #include <utility>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/macros.h"
+#include "base/memory/ptr_util.h"
 #include "mojo/message_pump/handle_watcher.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 
 namespace extensions {
 namespace {
 
 // An implementation of StashService that forwards calls to a StashBackend.
 class StashServiceImpl : public StashService {
  public:
   StashServiceImpl(mojo::InterfaceRequest<StashService> request,
@@ skipping 53 matching lines @@
   StashedObjectPtr Release();
 
   // Cancels notifications for handles becoming readable.
   void CancelHandleNotifications();
 
  private:
   // Invoked when a handle within |stashed_object_| is readable.
   void OnHandleReady(MojoResult result);
 
   // The waiters that are waiting for handles to be readable.
-  std::vector<scoped_ptr<mojo::common::HandleWatcher>> waiters_;
+  std::vector<std::unique_ptr<mojo::common::HandleWatcher>> waiters_;
 
   StashedObjectPtr stashed_object_;
 
   // If non-null, a callback to call when a handle contained within
   // |stashed_object_| is readable.
   const base::Closure on_handle_readable_;
 };
 
 StashBackend::StashBackend(const base::Closure& on_handle_readable)
     : on_handle_readable_(on_handle_readable),
       has_notified_(false),
       weak_factory_(this) {
 }
 
 StashBackend::~StashBackend() {
 }
 
 void StashBackend::AddToStash(mojo::Array<StashedObjectPtr> stashed_objects) {
   for (size_t i = 0; i < stashed_objects.size(); i++) {
-    stashed_objects_.push_back(make_scoped_ptr(new StashEntry(
+    stashed_objects_.push_back(base::WrapUnique(new StashEntry(
         std::move(stashed_objects[i]),
         has_notified_ ? base::Closure()
                       : base::Bind(&StashBackend::OnHandleReady,
                                    weak_factory_.GetWeakPtr()))));
   }
 }
 
 mojo::Array<StashedObjectPtr> StashBackend::RetrieveStash() {
   has_notified_ = false;
   mojo::Array<StashedObjectPtr> result;
@@ skipping 19 matching lines @@
 }
 
 StashBackend::StashEntry::StashEntry(StashedObjectPtr stashed_object,
                                      const base::Closure& on_handle_readable)
     : stashed_object_(std::move(stashed_object)),
       on_handle_readable_(on_handle_readable) {
   if (on_handle_readable_.is_null() || !stashed_object_->monitor_handles)
     return;
 
   for (size_t i = 0; i < stashed_object_->stashed_handles.size(); i++) {
-    scoped_ptr<mojo::common::HandleWatcher> watcher(
+    std::unique_ptr<mojo::common::HandleWatcher> watcher(
         new mojo::common::HandleWatcher());
     watcher->Start(stashed_object_->stashed_handles[i].get(),
                    MOJO_HANDLE_SIGNAL_READABLE, MOJO_DEADLINE_INDEFINITE,
                    base::Bind(&StashBackend::StashEntry::OnHandleReady,
                               base::Unretained(this)));
     waiters_.push_back(std::move(watcher));
   }
 }
 
 StashBackend::StashEntry::~StashEntry() {
 }
 
 StashedObjectPtr StashBackend::StashEntry::Release() {
   waiters_.clear();
   return std::move(stashed_object_);
 }
 
 void StashBackend::StashEntry::CancelHandleNotifications() {
   waiters_.clear();
 }
 
 void StashBackend::StashEntry::OnHandleReady(MojoResult result) {
   if (result != MOJO_RESULT_OK)
     return;
   on_handle_readable_.Run();
 }
 
 }  // namespace extensions