base::MakeUnique -> std::make_unique under ash
* Converted all base::MakeUnique to std::make_unique
* added/removed <memory> where necessary
* added/removed base/memory/ptr_util.h where necessary
* Converted base::WrapUnique to make_uniuqe where possible.
BUG=None
Change-Id: Iba2d5218757e69b39e014fb86366cd5c129ddb20
Reviewed-on: https://chromium-review.googlesource.com/706420
Commit-Queue: Mitsuru Oshima <[email protected]>
Reviewed-by: James Cook <[email protected]>
Cr-Commit-Position: refs/heads/master@{#507370}diff --git a/ash/host/ash_window_tree_host_unified.cc b/ash/host/ash_window_tree_host_unified.cc
index f0ab6761..862eca0 100644
--- a/ash/host/ash_window_tree_host_unified.cc
+++ b/ash/host/ash_window_tree_host_unified.cc
@@ -4,11 +4,11 @@
#include "ash/host/ash_window_tree_host_unified.h"
+#include <memory>
#include <utility>
#include "ash/host/root_window_transformer.h"
#include "base/logging.h"
-#include "base/memory/ptr_util.h"
#include "ui/aura/window.h"
#include "ui/aura/window_event_dispatcher.h"
#include "ui/aura/window_targeter.h"
@@ -70,7 +70,7 @@
AshWindowTreeHost* mirroring_ash_host) {
aura::Window* src_root = mirroring_ash_host->AsWindowTreeHost()->window();
src_root->SetEventTargeter(
- base::MakeUnique<UnifiedEventTargeter>(src_root, window()));
+ std::make_unique<UnifiedEventTargeter>(src_root, window()));
DCHECK(std::find(mirroring_hosts_.begin(), mirroring_hosts_.end(),
mirroring_ash_host) == mirroring_hosts_.end());
mirroring_hosts_.push_back(mirroring_ash_host);
