Index: mash/task_viewer/task_viewer.h |
diff --git a/mash/task_viewer/task_viewer.h b/mash/task_viewer/task_viewer.h |
index e5eeae09119b352d91ff35f1f64a5f3ec80d4c7f..0cc41c11ebf6ab440c60957add5e83ba8e6ab2f0 100644 |
--- a/mash/task_viewer/task_viewer.h |
+++ b/mash/task_viewer/task_viewer.h |
@@ -6,10 +6,10 @@ |
#define MASH_TASK_VIEWER_TASK_VIEWER_H_ |
#include <map> |
+#include <memory> |
#include "base/callback.h" |
#include "base/macros.h" |
-#include "base/memory/scoped_ptr.h" |
#include "mojo/services/tracing/public/cpp/tracing_impl.h" |
#include "mojo/shell/public/cpp/shell_client.h" |
@@ -32,7 +32,7 @@ class TaskViewer : public mojo::ShellClient { |
uint32_t id) override; |
mojo::TracingImpl tracing_; |
- scoped_ptr<views::AuraInit> aura_init_; |
+ std::unique_ptr<views::AuraInit> aura_init_; |
DISALLOW_COPY_AND_ASSIGN(TaskViewer); |
}; |