| Index: mash/task_viewer/task_viewer.cc
|
| diff --git a/mash/task_viewer/task_viewer.cc b/mash/task_viewer/task_viewer.cc
|
| index 6e3b018b7462dd9ec4820341b938a5045fe120a6..754d54eaff74cab179acc356bf072a20cf85df9d 100644
|
| --- a/mash/task_viewer/task_viewer.cc
|
| +++ b/mash/task_viewer/task_viewer.cc
|
| @@ -9,6 +9,7 @@
|
|
|
| #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"
|
| @@ -203,7 +204,7 @@ class TaskViewerContents : public views::WidgetDelegateView,
|
| }
|
|
|
| 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(
|
| @@ -258,7 +259,7 @@ class TaskViewerContents : public views::WidgetDelegateView,
|
| 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_;
|
|
|
|
|