convert //mash to std::unique_ptr

mash/task_viewer/task_viewer.cc

 // Copyright 2015 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 "mash/task_viewer/task_viewer.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include "base/bind.h"
 #include "base/macros.h"
+#include "base/memory/ptr_util.h"
 #include "base/memory/weak_ptr.h"
 #include "base/process/process.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "mojo/services/catalog/public/interfaces/catalog.mojom.h"
 #include "mojo/shell/public/cpp/connection.h"
 #include "mojo/shell/public/cpp/connector.h"
 #include "mojo/shell/public/interfaces/shell.mojom.h"
 #include "ui/base/models/table_model.h"
@@ skipping 174 matching lines @@
 
   bool ContainsId(uint32_t id) const {
     for (auto& it : instances_) {
       if (it->id == id)
         return true;
     }
     return false;
   }
 
   void InsertInstance(uint32_t id, const std::string& url, uint32_t pid) {
-    instances_.push_back(make_scoped_ptr(new InstanceInfo(id, url, pid)));
+    instances_.push_back(base::WrapUnique(new InstanceInfo(id, url, pid)));
   }
 
   void OnGotCatalogEntries(
       mojo::Map<mojo::String, catalog::mojom::CatalogEntryPtr> entries) {
     for (auto it = instances_.begin(); it != instances_.end(); ++it) {
       auto entry_it = entries.find((*it)->url);
       if (entry_it != entries.end()) {
         (*it)->name = entry_it->second->display_name;
         observer_->OnItemsChanged(
             static_cast<int>(it - instances_.begin()), 1);
@@ skipping 34 matching lines @@
   }
 
   mojo::Binding<mojo::shell::mojom::InstanceListener> binding_;
   catalog::mojom::CatalogPtr catalog_;
 
   views::TableView* table_view_;
   views::View* table_view_parent_;
   views::LabelButton* kill_button_;
   ui::TableModelObserver* observer_;
 
-  std::vector<scoped_ptr<InstanceInfo>> instances_;
+  std::vector<std::unique_ptr<InstanceInfo>> instances_;
 
   base::WeakPtrFactory<TaskViewerContents> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(TaskViewerContents);
 };
 
 }  // namespace
 
 TaskViewer::TaskViewer() {}
 TaskViewer::~TaskViewer() {}
@@ skipping 18 matching lines @@
 
   TaskViewerContents* task_viewer = new TaskViewerContents(
       std::move(request), std::move(catalog));
   views::Widget* window = views::Widget::CreateWindowWithContextAndBounds(
       task_viewer, nullptr, gfx::Rect(10, 10, 500, 500));
   window->Show();
 }
 
 }  // namespace task_viewer
 }  // namespace main