Replace scoped_ptr with std::unique_ptr in //ui

ui/aura/window_event_dispatcher_unittest.cc

 // Copyright (c) 2012 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 "ui/aura/window_event_dispatcher.h"
 
 #include <stddef.h>
 
 #include <utility>
 #include <vector>
@@ skipping 91 matching lines @@
   return client::GetFocusClient(window)->GetFocusedWindow() == window;
 }
 
 }  // namespace
 
 typedef test::AuraTestBase WindowEventDispatcherTest;
 
 TEST_F(WindowEventDispatcherTest, OnHostMouseEvent) {
   // Create two non-overlapping windows so we don't have to worry about which
   // is on top.
-  scoped_ptr<NonClientDelegate> delegate1(new NonClientDelegate());
-  scoped_ptr<NonClientDelegate> delegate2(new NonClientDelegate());
+  std::unique_ptr<NonClientDelegate> delegate1(new NonClientDelegate());
+  std::unique_ptr<NonClientDelegate> delegate2(new NonClientDelegate());
   const int kWindowWidth = 123;
   const int kWindowHeight = 45;
   gfx::Rect bounds1(100, 200, kWindowWidth, kWindowHeight);
   gfx::Rect bounds2(300, 400, kWindowWidth, kWindowHeight);
-  scoped_ptr<aura::Window> window1(CreateTestWindowWithDelegate(
+  std::unique_ptr<aura::Window> window1(CreateTestWindowWithDelegate(
       delegate1.get(), -1234, bounds1, root_window()));
-  scoped_ptr<aura::Window> window2(CreateTestWindowWithDelegate(
+  std::unique_ptr<aura::Window> window2(CreateTestWindowWithDelegate(
       delegate2.get(), -5678, bounds2, root_window()));
 
   // Send a mouse event to window1.
   gfx::Point point(101, 201);
   ui::MouseEvent event1(ui::ET_MOUSE_PRESSED, point, point,
                         ui::EventTimeForNow(), ui::EF_LEFT_MOUSE_BUTTON,
                         ui::EF_LEFT_MOUSE_BUTTON);
   DispatchEventUsingWindowDispatcher(&event1);
 
   // Event was tested for non-client area for the target window.
@@ skipping 28 matching lines @@
   RunAllPendingInMessageLoop();
   EXPECT_TRUE(Env::GetInstance()->is_touch_down());
 }
 
 // Check that we correctly track the state of the mouse buttons in response to
 // button press and release events.
 TEST_F(WindowEventDispatcherTest, MouseButtonState) {
   EXPECT_FALSE(Env::GetInstance()->IsMouseButtonDown());
 
   gfx::Point location;
-  scoped_ptr<ui::MouseEvent> event;
+  std::unique_ptr<ui::MouseEvent> event;
 
   // Press the left button.
   event.reset(new ui::MouseEvent(
       ui::ET_MOUSE_PRESSED, location, location, ui::EventTimeForNow(),
       ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON));
   DispatchEventUsingWindowDispatcher(event.get());
   EXPECT_TRUE(Env::GetInstance()->IsMouseButtonDown());
 
   // Additionally press the right.
   event.reset(new ui::MouseEvent(
@@ skipping 19 matching lines @@
 
   // Press the middle button.
   event.reset(new ui::MouseEvent(
       ui::ET_MOUSE_PRESSED, location, location, ui::EventTimeForNow(),
       ui::EF_MIDDLE_MOUSE_BUTTON, ui::EF_MIDDLE_MOUSE_BUTTON));
   DispatchEventUsingWindowDispatcher(event.get());
   EXPECT_TRUE(Env::GetInstance()->IsMouseButtonDown());
 }
 
 TEST_F(WindowEventDispatcherTest, TranslatedEvent) {
-  scoped_ptr<Window> w1(test::CreateTestWindowWithDelegate(NULL, 1,
-      gfx::Rect(50, 50, 100, 100), root_window()));
+  std::unique_ptr<Window> w1(test::CreateTestWindowWithDelegate(
+      NULL, 1, gfx::Rect(50, 50, 100, 100), root_window()));
 
   gfx::Point origin(100, 100);
   ui::MouseEvent root(ui::ET_MOUSE_PRESSED, origin, origin,
                       ui::EventTimeForNow(), 0, 0);
 
   EXPECT_EQ("100,100", root.location().ToString());
   EXPECT_EQ("100,100", root.root_location().ToString());
 
   ui::MouseEvent translated_event(
       root, static_cast<Window*>(root_window()), w1.get(),
@@ skipping 68 matching lines @@
   ui::test::TestEventHandler lock_ef;
   client.GetNonLockWindow()->AddPreTargetHandler(&nonlock_ef);
   client.GetLockWindow()->AddPreTargetHandler(&lock_ef);
 
   Window* w1 = test::CreateTestWindowWithBounds(gfx::Rect(10, 10, 20, 20),
                                                 client.GetNonLockWindow());
   w1->set_id(1);
   Window* w2 = test::CreateTestWindowWithBounds(gfx::Rect(30, 30, 20, 20),
                                                 client.GetNonLockWindow());
   w2->set_id(2);
-  scoped_ptr<Window> w3(
-      test::CreateTestWindowWithDelegate(&d, 3, gfx::Rect(30, 30, 20, 20),
-                                         client.GetLockWindow()));
+  std::unique_ptr<Window> w3(test::CreateTestWindowWithDelegate(
+      &d, 3, gfx::Rect(30, 30, 20, 20), client.GetLockWindow()));
 
   w1->Focus();
   EXPECT_TRUE(IsFocusedWindow(w1));
 
   client.Lock();
 
   // Since we're locked, the attempt to focus w2 will be ignored.
   w2->Focus();
   EXPECT_TRUE(IsFocusedWindow(w1));
   EXPECT_FALSE(IsFocusedWindow(w2));
@@ skipping 51 matching lines @@
   ui::KeyEvent unknown_key_with_char_event(ui::ET_KEY_PRESSED, ui::VKEY_UNKNOWN,
                                            ui::EF_NONE);
   unknown_key_with_char_event.set_character(0x00e4 /* "ä" */);
   DispatchEventUsingWindowDispatcher(&unknown_key_with_char_event);
   EXPECT_TRUE(unknown_key_with_char_event.handled());
   EXPECT_EQ(1, handler.num_key_events());
   root_window()->RemovePreTargetHandler(&handler);
 }
 
 TEST_F(WindowEventDispatcherTest, NoDelegateWindowReceivesKeyEvents) {
-  scoped_ptr<Window> w1(CreateNormalWindow(1, root_window(), NULL));
+  std::unique_ptr<Window> w1(CreateNormalWindow(1, root_window(), NULL));
   w1->Show();
   w1->Focus();
 
   ui::test::TestEventHandler handler;
   w1->AddPreTargetHandler(&handler);
   ui::KeyEvent key_press(ui::ET_KEY_PRESSED, ui::VKEY_A, ui::EF_NONE);
   DispatchEventUsingWindowDispatcher(&key_press);
   EXPECT_TRUE(key_press.handled());
   EXPECT_EQ(1, handler.num_key_events());
 
@@ skipping 23 matching lines @@
   root_window()->RemovePreTargetHandler(&handler);
 }
 
 // Tests that scroll events are dispatched correctly.
 TEST_F(WindowEventDispatcherTest, ScrollEventDispatch) {
   base::TimeDelta now = ui::EventTimeForNow();
   ui::test::TestEventHandler handler;
   root_window()->AddPreTargetHandler(&handler);
 
   test::TestWindowDelegate delegate;
-  scoped_ptr<Window> w1(CreateNormalWindow(1, root_window(), &delegate));
+  std::unique_ptr<Window> w1(CreateNormalWindow(1, root_window(), &delegate));
   w1->SetBounds(gfx::Rect(20, 20, 40, 40));
 
   // A scroll event on the root-window itself is dispatched.
   ui::ScrollEvent scroll1(ui::ET_SCROLL,
                           gfx::Point(10, 10),
                           now,
                           0,
                           0, -10,
                           0, -10,
                           2);
@@ skipping 82 matching lines @@
 
   bool HasReceivedEvent(ui::EventType type) {
     return std::find(events_.begin(), events_.end(), type) != events_.end();
   }
 
   bool LastTouchMayCauseScrolling() const {
     return last_touch_may_cause_scrolling_;
   }
 
  private:
-  scoped_ptr<base::RunLoop> run_loop_;
+  std::unique_ptr<base::RunLoop> run_loop_;
   ui::EventType wait_until_event_;
 
   Events events_;
   EventLocations mouse_locations_;
   EventLocations touch_locations_;
   EventLocations gesture_locations_;
   EventFlags mouse_event_flags_;
   bool last_touch_may_cause_scrolling_;
 
   DISALLOW_COPY_AND_ASSIGN(EventFilterRecorder);
@@ skipping 96 matching lines @@
 
 // Verifies a repost mouse event targets the window with capture (if there is
 // one).
 // Flaky on 32-bit Windows bots.  http://crbug.com/388290
 TEST_F(WindowEventDispatcherTest, MAYBE(RepostTargetsCaptureWindow)) {
   // Set capture on |window| generate a mouse event (that is reposted) and not
   // over |window| and verify |window| gets it (|window| gets it because it has
   // capture).
   EXPECT_FALSE(Env::GetInstance()->IsMouseButtonDown());
   EventFilterRecorder recorder;
-  scoped_ptr<Window> window(CreateNormalWindow(1, root_window(), NULL));
+  std::unique_ptr<Window> window(CreateNormalWindow(1, root_window(), NULL));
   window->SetBounds(gfx::Rect(20, 20, 40, 30));
   window->AddPreTargetHandler(&recorder);
   window->SetCapture();
   const ui::MouseEvent press_event(
       ui::ET_MOUSE_PRESSED, gfx::Point(), gfx::Point(), ui::EventTimeForNow(),
       ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON);
   host()->dispatcher()->RepostEvent(&press_event);
   RunAllPendingInMessageLoop();  // Necessitated by RepostEvent().
   // Mouse moves/enters may be generated. We only care about a pressed.
   EXPECT_TRUE(EventTypesToString(recorder.events()).find("MOUSE_PRESSED") !=
               std::string::npos) << EventTypesToString(recorder.events());
 }
 
 TEST_F(WindowEventDispatcherTest, MouseMovesHeld) {
   EventFilterRecorder recorder;
   root_window()->AddPreTargetHandler(&recorder);
 
   test::TestWindowDelegate delegate;
-  scoped_ptr<aura::Window> window(CreateTestWindowWithDelegate(
+  std::unique_ptr<aura::Window> window(CreateTestWindowWithDelegate(
       &delegate, 1, gfx::Rect(0, 0, 100, 100), root_window()));
 
   ui::MouseEvent mouse_move_event(ui::ET_MOUSE_MOVED, gfx::Point(0, 0),
                                   gfx::Point(0, 0), ui::EventTimeForNow(), 0,
                                   0);
   DispatchEventUsingWindowDispatcher(&mouse_move_event);
   // Discard MOUSE_ENTER.
   recorder.Reset();
 
   host()->dispatcher()->HoldPointerMoves();
@@ skipping 106 matching lines @@
   EXPECT_EQ(gfx::Point(13, 13), recorder.mouse_location(0));
   recorder.Reset();
   root_window()->RemovePreTargetHandler(&recorder);
 }
 
 TEST_F(WindowEventDispatcherTest, TouchMovesHeld) {
   EventFilterRecorder recorder;
   root_window()->AddPreTargetHandler(&recorder);
 
   test::TestWindowDelegate delegate;
-  scoped_ptr<aura::Window> window(CreateTestWindowWithDelegate(
+  std::unique_ptr<aura::Window> window(CreateTestWindowWithDelegate(
       &delegate, 1, gfx::Rect(50, 50, 100, 100), root_window()));
 
   // Starting the touch and throwing out the first few events, since the system
   // is going to generate synthetic mouse events that are not relevant to the
   // test.
   ui::TouchEvent touch_pressed_event(
       ui::ET_TOUCH_PRESSED, gfx::Point(10, 10), 0, ui::EventTimeForNow());
   DispatchEventUsingWindowDispatcher(&touch_pressed_event);
   recorder.WaitUntilReceivedEvent(ui::ET_GESTURE_SHOW_PRESS);
   recorder.Reset();
@@ skipping 38 matching lines @@
   root_window()->RemovePreTargetHandler(&recorder);
 }
 
 // Tests that mouse move event has a right location
 // when there isn't the target window
 TEST_F(WindowEventDispatcherTest, MouseEventWithoutTargetWindow) {
   EventFilterRecorder recorder_first;
   EventFilterRecorder recorder_second;
 
   test::TestWindowDelegate delegate;
-  scoped_ptr<aura::Window> window_first(CreateTestWindowWithDelegate(
+  std::unique_ptr<aura::Window> window_first(CreateTestWindowWithDelegate(
       &delegate, 1, gfx::Rect(20, 10, 10, 20), root_window()));
   window_first->Show();
   window_first->AddPreTargetHandler(&recorder_first);
 
-  scoped_ptr<aura::Window> window_second(CreateTestWindowWithDelegate(
+  std::unique_ptr<aura::Window> window_second(CreateTestWindowWithDelegate(
       &delegate, 2, gfx::Rect(20, 30, 10, 20), root_window()));
   window_second->Show();
   window_second->AddPreTargetHandler(&recorder_second);
 
   const gfx::Point event_location(22, 33);
   ui::MouseEvent mouse(ui::ET_MOUSE_MOVED, event_location, event_location,
                        ui::EventTimeForNow(), 0, 0);
   DispatchEventUsingWindowDispatcher(&mouse);
 
   EXPECT_TRUE(recorder_first.events().empty());
   EXPECT_EQ("MOUSE_ENTERED MOUSE_MOVED",
             EventTypesToString(recorder_second.events()));
   ASSERT_EQ(2u, recorder_second.mouse_locations().size());
   EXPECT_EQ(gfx::Point(2, 3).ToString(),
             recorder_second.mouse_locations()[0].ToString());
 }
 
 // Tests that a mouse exit is dispatched to the last mouse location when
 // the window is hiddden.
 TEST_F(WindowEventDispatcherTest, DispatchMouseExitWhenHidingWindow) {
   EventFilterRecorder recorder;
 
   test::TestWindowDelegate delegate;
-  scoped_ptr<aura::Window> window(CreateTestWindowWithDelegate(
+  std::unique_ptr<aura::Window> window(CreateTestWindowWithDelegate(
       &delegate, 1, gfx::Rect(10, 10, 50, 50), root_window()));
   window->Show();
   window->AddPreTargetHandler(&recorder);
 
   // Dispatch a mouse move event into the window.
   const gfx::Point event_location(22, 33);
   ui::MouseEvent mouse(ui::ET_MOUSE_MOVED, event_location, event_location,
                        ui::EventTimeForNow(), 0, 0);
   DispatchEventUsingWindowDispatcher(&mouse);
   EXPECT_FALSE(recorder.events().empty());
   recorder.Reset();
 
   // Hide the window and verify a mouse exit event's location.
   window->Hide();
   EXPECT_FALSE(recorder.events().empty());
   EXPECT_EQ("MOUSE_EXITED", EventTypesToString(recorder.events()));
   ASSERT_EQ(1u, recorder.mouse_locations().size());
   EXPECT_EQ(gfx::Point(12, 23).ToString(),
             recorder.mouse_locations()[0].ToString());
 }
 
 // Verifies that a direct call to ProcessedTouchEvent() does not cause a crash.
 TEST_F(WindowEventDispatcherTest, CallToProcessedTouchEvent) {
   test::TestWindowDelegate delegate;
-  scoped_ptr<aura::Window> window(CreateTestWindowWithDelegate(
+  std::unique_ptr<aura::Window> window(CreateTestWindowWithDelegate(
       &delegate, 1, gfx::Rect(50, 50, 100, 100), root_window()));
 
   host()->dispatcher()->ProcessedTouchEvent(0, window.get(), ui::ER_UNHANDLED);
 }
 
 // This event handler requests the dispatcher to start holding pointer-move
 // events when it receives the first scroll-update gesture.
 class HoldPointerOnScrollHandler : public ui::test::TestEventHandler {
  public:
   HoldPointerOnScrollHandler(WindowEventDispatcher* dispatcher,
@@ skipping 23 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(HoldPointerOnScrollHandler);
 };
 
 // Tests that touch-move events don't contribute to an in-progress scroll
 // gesture if touch-move events are being held by the dispatcher.
 TEST_F(WindowEventDispatcherTest, TouchMovesHeldOnScroll) {
   EventFilterRecorder recorder;
   root_window()->AddPreTargetHandler(&recorder);
   test::TestWindowDelegate delegate;
   HoldPointerOnScrollHandler handler(host()->dispatcher(), &recorder);
-  scoped_ptr<aura::Window> window(CreateTestWindowWithDelegate(
+  std::unique_ptr<aura::Window> window(CreateTestWindowWithDelegate(
       &delegate, 1, gfx::Rect(50, 50, 100, 100), root_window()));
   window->AddPreTargetHandler(&handler);
 
   ui::test::EventGenerator generator(root_window());
   generator.GestureScrollSequence(
       gfx::Point(60, 60), gfx::Point(10, 60),
       base::TimeDelta::FromMilliseconds(100), 25);
 
   // |handler| will have reset |filter| and started holding the touch-move
   // events when scrolling started. At the end of the scroll (i.e. upon
@@ skipping 47 matching lines @@
   root_window()->RemovePreTargetHandler(&recorder);
 }
 
 // Tests that synthetic mouse events are ignored when mouse
 // events are disabled.
 TEST_F(WindowEventDispatcherTest, DispatchSyntheticMouseEvents) {
   EventFilterRecorder recorder;
   root_window()->AddPreTargetHandler(&recorder);
 
   test::TestWindowDelegate delegate;
-  scoped_ptr<aura::Window> window(CreateTestWindowWithDelegate(
+  std::unique_ptr<aura::Window> window(CreateTestWindowWithDelegate(
       &delegate, 1234, gfx::Rect(5, 5, 100, 100), root_window()));
   window->Show();
   window->SetCapture();
 
   test::TestCursorClient cursor_client(root_window());
 
   // Dispatch a non-synthetic mouse event when mouse events are enabled.
   ui::MouseEvent mouse1(ui::ET_MOUSE_MOVED, gfx::Point(10, 10),
                         gfx::Point(10, 10), ui::EventTimeForNow(), 0, 0);
   DispatchEventUsingWindowDispatcher(&mouse1);
@@ skipping 12 matching lines @@
   cursor_client.DisableMouseEvents();
   DispatchEventUsingWindowDispatcher(&mouse2);
   EXPECT_TRUE(recorder.events().empty());
   root_window()->RemovePreTargetHandler(&recorder);
 }
 
 // Tests that a mouse-move event is not synthesized when a mouse-button is down.
 TEST_F(WindowEventDispatcherTest, DoNotSynthesizeWhileButtonDown) {
   EventFilterRecorder recorder;
   test::TestWindowDelegate delegate;
-  scoped_ptr<aura::Window> window(CreateTestWindowWithDelegate(
+  std::unique_ptr<aura::Window> window(CreateTestWindowWithDelegate(
       &delegate, 1234, gfx::Rect(5, 5, 100, 100), root_window()));
   window->Show();
 
   window->AddPreTargetHandler(&recorder);
   // Dispatch a non-synthetic mouse event when mouse events are enabled.
   ui::MouseEvent mouse1(ui::ET_MOUSE_PRESSED, gfx::Point(10, 10),
                         gfx::Point(10, 10), ui::EventTimeForNow(),
                         ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON);
   DispatchEventUsingWindowDispatcher(&mouse1);
   ASSERT_EQ(1u, recorder.events().size());
@@ skipping 16 matching lines @@
 #define MAYBE(x) x
 #endif
 
 // Tests synthetic mouse events generated when window bounds changes such that
 // the cursor previously outside the window becomes inside, or vice versa.
 // Do not synthesize events if the window ignores events or is invisible.
 // Flaky on 32-bit Windows bots.  http://crbug.com/388272
 TEST_F(WindowEventDispatcherTest,
        MAYBE(SynthesizeMouseEventsOnWindowBoundsChanged)) {
   test::TestWindowDelegate delegate;
-  scoped_ptr<aura::Window> window(CreateTestWindowWithDelegate(
+  std::unique_ptr<aura::Window> window(CreateTestWindowWithDelegate(
       &delegate, 1234, gfx::Rect(5, 5, 100, 100), root_window()));
   window->Show();
   window->SetCapture();
 
   EventFilterRecorder recorder;
   window->AddPreTargetHandler(&recorder);
 
   // Dispatch a non-synthetic mouse event to place cursor inside window bounds.
   ui::MouseEvent mouse(ui::ET_MOUSE_MOVED, gfx::Point(10, 10),
                        gfx::Point(10, 10), ui::EventTimeForNow(), 0, 0);
@@ skipping 36 matching lines @@
 }
 
 // Tests that a mouse exit is dispatched to the last known cursor location
 // when the cursor becomes invisible.
 TEST_F(WindowEventDispatcherTest, DispatchMouseExitWhenCursorHidden) {
   EventFilterRecorder recorder;
   root_window()->AddPreTargetHandler(&recorder);
 
   test::TestWindowDelegate delegate;
   gfx::Point window_origin(7, 18);
-  scoped_ptr<aura::Window> window(CreateTestWindowWithDelegate(
+  std::unique_ptr<aura::Window> window(CreateTestWindowWithDelegate(
       &delegate, 1234, gfx::Rect(window_origin, gfx::Size(100, 100)),
       root_window()));
   window->Show();
 
   // Dispatch a mouse move event into the window.
   gfx::Point mouse_location(gfx::Point(15, 25));
   ui::MouseEvent mouse1(ui::ET_MOUSE_MOVED, mouse_location, mouse_location,
                         ui::EventTimeForNow(), 0, 0);
   EXPECT_TRUE(recorder.events().empty());
   DispatchEventUsingWindowDispatcher(&mouse1);
@@ skipping 16 matching lines @@
 
 // Tests that a synthetic mouse exit is dispatched to the last known cursor
 // location after mouse events are disabled on the cursor client.
 TEST_F(WindowEventDispatcherTest,
        DispatchSyntheticMouseExitAfterMouseEventsDisabled) {
   EventFilterRecorder recorder;
   root_window()->AddPreTargetHandler(&recorder);
 
   test::TestWindowDelegate delegate;
   gfx::Point window_origin(7, 18);
-  scoped_ptr<aura::Window> window(CreateTestWindowWithDelegate(
+  std::unique_ptr<aura::Window> window(CreateTestWindowWithDelegate(
       &delegate, 1234, gfx::Rect(window_origin, gfx::Size(100, 100)),
       root_window()));
   window->Show();
 
   // Dispatch a mouse move event into the window.
   gfx::Point mouse_location(gfx::Point(15, 25));
   ui::MouseEvent mouse1(ui::ET_MOUSE_MOVED, mouse_location, mouse_location,
                         ui::EventTimeForNow(), 0, 0);
   EXPECT_TRUE(recorder.events().empty());
   DispatchEventUsingWindowDispatcher(&mouse1);
@@ skipping 83 matching lines @@
   bool delete_during_handle_;
   bool got_event_;
 
   DISALLOW_COPY_AND_ASSIGN(DeletingWindowDelegate);
 };
 
 TEST_F(WindowEventDispatcherTest, DeleteWindowDuringDispatch) {
   // Verifies that we can delete a window during each phase of event handling.
   // Deleting the window should not cause a crash, only prevent further
   // processing from occurring.
-  scoped_ptr<Window> w1(CreateNormalWindow(1, root_window(), NULL));
+  std::unique_ptr<Window> w1(CreateNormalWindow(1, root_window(), NULL));
   DeletingWindowDelegate d11;
   Window* w11 = CreateNormalWindow(11, w1.get(), &d11);
   WindowTracker tracker;
   DeletingEventFilter w1_filter;
   w1->AddPreTargetHandler(&w1_filter);
   client::GetFocusClient(w1.get())->FocusWindow(w11);
 
   ui::test::EventGenerator generator(root_window(), w11);
 
   // First up, no one deletes anything.
@@ skipping 47 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(DetachesParentOnTapDelegate);
 };
 
 }  // namespace
 
 // Tests that the gesture recognizer is reset for all child windows when a
 // window hides. No expectations, just checks that the test does not crash.
 TEST_F(WindowEventDispatcherTest,
        GestureRecognizerResetsTargetWhenParentHides) {
-  scoped_ptr<Window> w1(CreateNormalWindow(1, root_window(), NULL));
+  std::unique_ptr<Window> w1(CreateNormalWindow(1, root_window(), NULL));
   DetachesParentOnTapDelegate delegate;
-  scoped_ptr<Window> parent(CreateNormalWindow(22, w1.get(), NULL));
+  std::unique_ptr<Window> parent(CreateNormalWindow(22, w1.get(), NULL));
   Window* child = CreateNormalWindow(11, parent.get(), &delegate);
   ui::test::EventGenerator generator(root_window(), child);
   generator.GestureTapAt(gfx::Point(40, 40));
 }
 
 namespace {
 
 // A window delegate that processes nested gestures on tap.
 class NestedGestureDelegate : public test::TestWindowDelegate {
  public:
@@ skipping 29 matching lines @@
   const gfx::Point tap_location_;
   int gesture_end_count_;
   DISALLOW_COPY_AND_ASSIGN(NestedGestureDelegate);
 };
 
 }  // namespace
 
 // Tests that gesture end is delivered after nested gesture processing.
 TEST_F(WindowEventDispatcherTest, GestureEndDeliveredAfterNestedGestures) {
   NestedGestureDelegate d1(NULL, gfx::Point());
-  scoped_ptr<Window> w1(CreateNormalWindow(1, root_window(), &d1));
+  std::unique_ptr<Window> w1(CreateNormalWindow(1, root_window(), &d1));
   w1->SetBounds(gfx::Rect(0, 0, 100, 100));
 
   ui::test::EventGenerator nested_generator(root_window(), w1.get());
   NestedGestureDelegate d2(&nested_generator, w1->bounds().CenterPoint());
-  scoped_ptr<Window> w2(CreateNormalWindow(1, root_window(), &d2));
+  std::unique_ptr<Window> w2(CreateNormalWindow(1, root_window(), &d2));
   w2->SetBounds(gfx::Rect(100, 0, 100, 100));
 
   // Tap on w2 which triggers nested gestures for w1.
   ui::test::EventGenerator generator(root_window(), w2.get());
   generator.GestureTapAt(w2->bounds().CenterPoint());
 
   // Both windows should get their gesture end events.
   EXPECT_EQ(1, d1.gesture_end_count());
   EXPECT_EQ(1, d2.gesture_end_count());
 }
 
 // Tests whether we can repost the Tap down gesture event.
 TEST_F(WindowEventDispatcherTest, RepostTapdownGestureTest) {
   EventFilterRecorder recorder;
   root_window()->AddPreTargetHandler(&recorder);
 
   test::TestWindowDelegate delegate;
-  scoped_ptr<aura::Window> window(CreateTestWindowWithDelegate(
+  std::unique_ptr<aura::Window> window(CreateTestWindowWithDelegate(
       &delegate, 1, gfx::Rect(0, 0, 100, 100), root_window()));
 
   ui::GestureEventDetails details(ui::ET_GESTURE_TAP_DOWN);
   gfx::Point point(10, 10);
   ui::GestureEvent event(point.x(),
                          point.y(),
                          0,
                          ui::EventTimeForNow(),
                          details);
   host()->dispatcher()->RepostEvent(&event);
@@ skipping 70 matching lines @@
     "GESTURE_TAP_CANCEL GESTURE_SCROLL_BEGIN GESTURE_SCROLL_UPDATE TOUCH_MOVED "
     "GESTURE_SCROLL_UPDATE TOUCH_MOVED GESTURE_SCROLL_UPDATE TOUCH_RELEASED "
     "GESTURE_SCROLL_END GESTURE_END";
   // We create two windows.
   // The first window (repost_source) is the one to which the initial tap
   // gesture is sent. It reposts this event to the second window
   // (repost_target).
   // We then generate the scroll sequence for repost_target and look for two
   // ET_GESTURE_TAP_DOWN events in the event list at the end.
   test::TestWindowDelegate delegate;
-  scoped_ptr<aura::Window> repost_target(CreateTestWindowWithDelegate(
+  std::unique_ptr<aura::Window> repost_target(CreateTestWindowWithDelegate(
       &delegate, 1, gfx::Rect(0, 0, 100, 100), root_window()));
 
-  scoped_ptr<aura::Window> repost_source(CreateTestWindowWithDelegate(
+  std::unique_ptr<aura::Window> repost_source(CreateTestWindowWithDelegate(
       &delegate, 1, gfx::Rect(0, 0, 50, 50), root_window()));
 
   RepostGestureEventRecorder repost_event_recorder(repost_source.get(),
                                                    repost_target.get());
   root_window()->AddPreTargetHandler(&repost_event_recorder);
 
   // Generate a tap down gesture for the repost_source. This will be reposted
   // to repost_target.
   ui::test::EventGenerator repost_generator(root_window(), repost_source.get());
   repost_generator.GestureTapAt(gfx::Point(40, 40));
@@ skipping 51 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(OnMouseExitDeletingEventFilter);
 };
 
 // Tests that RootWindow drops mouse-moved event that is supposed to be sent to
 // a child, but the child is destroyed because of the synthesized mouse-exit
 // event generated on the previous mouse_moved_handler_.
 TEST_F(WindowEventDispatcherTest, DeleteWindowDuringMouseMovedDispatch) {
   // Create window 1 and set its event filter. Window 1 will take ownership of
   // the event filter.
-  scoped_ptr<Window> w1(CreateNormalWindow(1, root_window(), NULL));
+  std::unique_ptr<Window> w1(CreateNormalWindow(1, root_window(), NULL));
   OnMouseExitDeletingEventFilter<Window> w1_filter;
   w1->AddPreTargetHandler(&w1_filter);
   w1->SetBounds(gfx::Rect(20, 20, 60, 60));
   EXPECT_EQ(NULL, host()->dispatcher()->mouse_moved_handler());
 
   ui::test::EventGenerator generator(root_window(), w1.get());
 
   // Move mouse over window 1 to set it as the |mouse_moved_handler_| for the
   // root window.
   generator.MoveMouseTo(51, 51);
@@ skipping 94 matching lines @@
 
 }  // namespace
 
 // Verifies GetRootWindow() from ~Window returns a valid root.
 TEST_F(WindowEventDispatcherTest, ValidRootDuringDestruction) {
   bool got_destroying = false;
   bool has_valid_root = false;
   ValidRootDuringDestructionWindowObserver observer(&got_destroying,
                                                     &has_valid_root);
   {
-    scoped_ptr<WindowTreeHost> host(
+    std::unique_ptr<WindowTreeHost> host(
         WindowTreeHost::Create(gfx::Rect(0, 0, 100, 100)));
     host->InitHost();
     // Owned by WindowEventDispatcher.
     Window* w1 = CreateNormalWindow(1, host->window(), NULL);
     w1->AddObserver(&observer);
   }
   EXPECT_TRUE(got_destroying);
   EXPECT_TRUE(has_valid_root);
 }
 
@@ skipping 29 matching lines @@
 
 }  // namespace
 
 // Verifies RootWindow doesn't reset |RootWindow::held_repostable_event_| after
 // dispatching. This is done by using DontResetHeldEventWindowDelegate, which
 // tracks the number of events with ui::EF_SHIFT_DOWN set (all reposted events
 // have EF_SHIFT_DOWN). When the first event is seen RepostEvent() is used to
 // schedule another reposted event.
 TEST_F(WindowEventDispatcherTest, DontResetHeldEvent) {
   DontResetHeldEventWindowDelegate delegate(root_window());
-  scoped_ptr<Window> w1(CreateNormalWindow(1, root_window(), &delegate));
+  std::unique_ptr<Window> w1(CreateNormalWindow(1, root_window(), &delegate));
   w1->SetBounds(gfx::Rect(0, 0, 40, 40));
   ui::MouseEvent pressed(ui::ET_MOUSE_PRESSED, gfx::Point(10, 10),
                          gfx::Point(10, 10), ui::EventTimeForNow(),
                          ui::EF_SHIFT_DOWN, 0);
   root_window()->GetHost()->dispatcher()->RepostEvent(&pressed);
   ui::MouseEvent pressed2(ui::ET_MOUSE_PRESSED, gfx::Point(10, 10),
                           gfx::Point(10, 10), ui::EventTimeForNow(), 0, 0);
   // Dispatch an event to flush event scheduled by way of RepostEvent().
   DispatchEventUsingWindowDispatcher(&pressed2);
   // Delegate should have seen reposted event (identified by way of
@@ skipping 57 matching lines @@
   RunAllPendingInMessageLoop();
   EXPECT_TRUE(delegate.got_mouse_event());
   EXPECT_TRUE(delegate.got_destroy());
 }
 
 TEST_F(WindowEventDispatcherTest, WindowHideCancelsActiveTouches) {
   EventFilterRecorder recorder;
   root_window()->AddPreTargetHandler(&recorder);
 
   test::TestWindowDelegate delegate;
-  scoped_ptr<aura::Window> window(CreateTestWindowWithDelegate(
+  std::unique_ptr<aura::Window> window(CreateTestWindowWithDelegate(
       &delegate, 1, gfx::Rect(0, 0, 100, 100), root_window()));
 
   gfx::Point position1 = root_window()->bounds().origin();
   ui::TouchEvent press(
       ui::ET_TOUCH_PRESSED, position1, 0, ui::EventTimeForNow());
   DispatchEventUsingWindowDispatcher(&press);
 
   EXPECT_EQ("TOUCH_PRESSED GESTURE_BEGIN GESTURE_TAP_DOWN",
             EventTypesToString(recorder.GetAndResetEvents()));
 
   window->Hide();
 
   EXPECT_EQ(ui::ET_TOUCH_CANCELLED, recorder.events()[0]);
   EXPECT_TRUE(recorder.HasReceivedEvent(ui::ET_GESTURE_TAP_CANCEL));
   EXPECT_TRUE(recorder.HasReceivedEvent(ui::ET_GESTURE_END));
   EXPECT_EQ(3U, recorder.events().size());
   root_window()->RemovePreTargetHandler(&recorder);
 }
 
 TEST_F(WindowEventDispatcherTest, WindowHideCancelsActiveGestures) {
   EventFilterRecorder recorder;
   root_window()->AddPreTargetHandler(&recorder);
 
   test::TestWindowDelegate delegate;
-  scoped_ptr<aura::Window> window(CreateTestWindowWithDelegate(
+  std::unique_ptr<aura::Window> window(CreateTestWindowWithDelegate(
       &delegate, 1, gfx::Rect(0, 0, 100, 100), root_window()));
 
   gfx::Point position1 = root_window()->bounds().origin();
   gfx::Point position2 = root_window()->bounds().CenterPoint();
   ui::TouchEvent press(
       ui::ET_TOUCH_PRESSED, position1, 0, ui::EventTimeForNow());
   DispatchEventUsingWindowDispatcher(&press);
 
   ui::TouchEvent move(
       ui::ET_TOUCH_MOVED, position2, 0, ui::EventTimeForNow());
@@ skipping 32 matching lines @@
 
   root_window()->RemovePreTargetHandler(&recorder);
 }
 
 // Places two windows side by side. Presses down on one window, and starts a
 // scroll. Sets capture on the other window and ensures that the "ending" events
 // aren't sent to the window which gained capture.
 TEST_F(WindowEventDispatcherTest, EndingEventDoesntRetarget) {
   EventFilterRecorder recorder1;
   EventFilterRecorder recorder2;
-  scoped_ptr<Window> window1(CreateNormalWindow(1, root_window(), NULL));
+  std::unique_ptr<Window> window1(CreateNormalWindow(1, root_window(), NULL));
   window1->SetBounds(gfx::Rect(0, 0, 40, 40));
 
-  scoped_ptr<Window> window2(CreateNormalWindow(2, root_window(), NULL));
+  std::unique_ptr<Window> window2(CreateNormalWindow(2, root_window(), NULL));
   window2->SetBounds(gfx::Rect(40, 0, 40, 40));
 
   window1->AddPreTargetHandler(&recorder1);
   window2->AddPreTargetHandler(&recorder2);
 
   gfx::Point position = window1->bounds().origin();
   ui::TouchEvent press(
       ui::ET_TOUCH_PRESSED, position, 0, ui::EventTimeForNow());
   DispatchEventUsingWindowDispatcher(&press);
 
@@ skipping 34 matching lines @@
   void OnCaptureLost() override { capture_window_.reset(); }
 
   void OnWindowDestroyed(Window* window) override {
     TestWindowDelegate::OnWindowDestroyed(window);
     capture_window_.reset();
   }
 
   aura::Window* capture_window() { return capture_window_.get(); }
 
  private:
-  scoped_ptr<aura::Window> capture_window_;
+  std::unique_ptr<aura::Window> capture_window_;
 
   DISALLOW_COPY_AND_ASSIGN(CaptureWindowTracker);
 };
 
 }
 
 // Verifies handling loss of capture by the capture window being hidden.
 TEST_F(WindowEventDispatcherTest, CaptureWindowHidden) {
   CaptureWindowTracker capture_window_tracker;
   capture_window_tracker.CreateCaptureWindow(root_window());
@@ skipping 32 matching lines @@
   ~WindowEventDispatcherTestWithMessageLoop() override {}
 
   void RunTest() {
     // Reset any event the window may have received when bringing up the window
     // (e.g. mouse-move events if the mouse cursor is over the window).
     handler_.Reset();
 
     // Start a nested message-loop, post an event to be dispatched, and then
     // terminate the message-loop. When the message-loop unwinds and gets back,
     // the reposted event should not have fired.
-    scoped_ptr<ui::MouseEvent> mouse(new ui::MouseEvent(
+    std::unique_ptr<ui::MouseEvent> mouse(new ui::MouseEvent(
         ui::ET_MOUSE_PRESSED, gfx::Point(10, 10), gfx::Point(10, 10),
         ui::EventTimeForNow(), ui::EF_NONE, ui::EF_NONE));
     message_loop()->PostTask(
         FROM_HERE,
         base::Bind(&WindowEventDispatcherTestWithMessageLoop::RepostEventHelper,
                    host()->dispatcher(),
                    base::Passed(&mouse)));
     message_loop()->PostTask(FROM_HERE, message_loop()->QuitWhenIdleClosure());
 
     base::MessageLoop::ScopedNestableTaskAllower allow(message_loop());
@@ skipping 17 matching lines @@
   }
 
   void TearDown() override {
     window_.reset();
     WindowEventDispatcherTest::TearDown();
   }
 
  private:
   // Used to avoid a copying |event| when binding to a closure.
   static void RepostEventHelper(WindowEventDispatcher* dispatcher,
-                                scoped_ptr<ui::MouseEvent> event) {
+                                std::unique_ptr<ui::MouseEvent> event) {
     dispatcher->RepostEvent(event.get());
   }
 
-  scoped_ptr<Window> window_;
+  std::unique_ptr<Window> window_;
   ExitMessageLoopOnMousePress handler_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowEventDispatcherTestWithMessageLoop);
 };
 
 TEST_F(WindowEventDispatcherTestWithMessageLoop, EventRepostedInNonNestedLoop) {
   CHECK(!message_loop()->is_running());
   // Perform the test in a callback, so that it runs after the message-loop
   // starts.
   message_loop()->PostTask(
@@ skipping 14 matching lines @@
 
  protected:
   void SetUp() override {
     WindowEventDispatcherTest::SetUp();
     test_screen()->SetDeviceScaleFactor(2.f);
   }
 };
 
 TEST_F(WindowEventDispatcherTestInHighDPI, EventLocationTransform) {
   test::TestWindowDelegate delegate;
-  scoped_ptr<aura::Window> child(test::CreateTestWindowWithDelegate(&delegate,
-      1234, gfx::Rect(20, 20, 100, 100), root_window()));
+  std::unique_ptr<aura::Window> child(test::CreateTestWindowWithDelegate(
+      &delegate, 1234, gfx::Rect(20, 20, 100, 100), root_window()));
   child->Show();
 
   ui::test::TestEventHandler handler_child;
   ui::test::TestEventHandler handler_root;
   root_window()->AddPreTargetHandler(&handler_root);
   child->AddPreTargetHandler(&handler_child);
 
   {
     ui::MouseEvent move(ui::ET_MOUSE_MOVED, gfx::Point(30, 30),
                         gfx::Point(30, 30), ui::EventTimeForNow(), ui::EF_NONE,
@@ skipping 17 matching lines @@
 
   child->RemovePreTargetHandler(&handler_child);
   root_window()->RemovePreTargetHandler(&handler_root);
 }
 
 TEST_F(WindowEventDispatcherTestInHighDPI, TouchMovesHeldOnScroll) {
   EventFilterRecorder recorder;
   root_window()->AddPreTargetHandler(&recorder);
   test::TestWindowDelegate delegate;
   HoldPointerOnScrollHandler handler(host()->dispatcher(), &recorder);
-  scoped_ptr<aura::Window> window(CreateTestWindowWithDelegate(
+  std::unique_ptr<aura::Window> window(CreateTestWindowWithDelegate(
       &delegate, 1, gfx::Rect(50, 50, 100, 100), root_window()));
   window->AddPreTargetHandler(&handler);
 
   ui::test::EventGenerator generator(root_window());
   generator.GestureScrollSequence(
       gfx::Point(120, 120), gfx::Point(20, 120),
       base::TimeDelta::FromMilliseconds(100), 25);
 
   // |handler| will have reset |filter| and started holding the touch-move
   // events when scrolling started. At the end of the scroll (i.e. upon
@@ skipping 46 matching lines @@
   gfx::Point mouse_move_location_;
 
   DISALLOW_COPY_AND_ASSIGN(TriggerNestedLoopOnRightMousePress);
 };
 
 // Tests that if dispatching a 'held' event triggers a nested message loop, then
 // the events that are dispatched from the nested message loop are transformed
 // correctly.
 TEST_F(WindowEventDispatcherTestInHighDPI,
        EventsTransformedInRepostedEventTriggeredNestedLoop) {
-  scoped_ptr<Window> window(CreateNormalWindow(1, root_window(), NULL));
+  std::unique_ptr<Window> window(CreateNormalWindow(1, root_window(), NULL));
   // Make sure the window is visible.
   RunAllPendingInMessageLoop();
 
   ui::MouseEvent mouse_move(ui::ET_MOUSE_MOVED, gfx::Point(80, 80),
                             gfx::Point(80, 80), ui::EventTimeForNow(),
                             ui::EF_NONE, ui::EF_NONE);
   const base::Closure callback_on_right_click = base::Bind(
       base::IgnoreResult(&WindowEventDispatcherTestInHighDPI::DispatchEvent),
       base::Unretained(this), base::Unretained(&mouse_move));
   TriggerNestedLoopOnRightMousePress handler(callback_on_right_click);
   window->AddPreTargetHandler(&handler);
 
-  scoped_ptr<ui::MouseEvent> mouse(
+  std::unique_ptr<ui::MouseEvent> mouse(
       new ui::MouseEvent(ui::ET_MOUSE_PRESSED, gfx::Point(10, 10),
                          gfx::Point(10, 10), ui::EventTimeForNow(),
                          ui::EF_RIGHT_MOUSE_BUTTON, ui::EF_RIGHT_MOUSE_BUTTON));
   host()->dispatcher()->RepostEvent(mouse.get());
   EXPECT_EQ(0, handler.num_mouse_events());
 
   base::RunLoop run_loop;
   run_loop.RunUntilIdle();
   // The window should receive the mouse-press and the mouse-move events.
   EXPECT_EQ(2, handler.num_mouse_events());
   // The mouse-move event location should be transformed because of the DSF
   // before it reaches the window.
   EXPECT_EQ(gfx::Point(40, 40).ToString(),
             handler.mouse_move_location().ToString());
   EXPECT_EQ(gfx::Point(40, 40).ToString(),
             Env::GetInstance()->last_mouse_location().ToString());
   window->RemovePreTargetHandler(&handler);
 }
 
 class SelfDestructDelegate : public test::TestWindowDelegate {
  public:
   SelfDestructDelegate() {}
   ~SelfDestructDelegate() override {}
 
   void OnMouseEvent(ui::MouseEvent* event) override { window_.reset(); }
 
-  void set_window(scoped_ptr<aura::Window> window) {
+  void set_window(std::unique_ptr<aura::Window> window) {
     window_ = std::move(window);
   }
   bool has_window() const { return !!window_.get(); }
 
  private:
-  scoped_ptr<aura::Window> window_;
+  std::unique_ptr<aura::Window> window_;
   DISALLOW_COPY_AND_ASSIGN(SelfDestructDelegate);
 };
 
 TEST_F(WindowEventDispatcherTest, SynthesizedLocatedEvent) {
   ui::test::EventGenerator generator(root_window());
   generator.MoveMouseTo(10, 10);
   EXPECT_EQ("10,10",
             Env::GetInstance()->last_mouse_location().ToString());
 
   // Synthesized event should not update the mouse location.
   ui::MouseEvent mouseev(ui::ET_MOUSE_MOVED, gfx::Point(), gfx::Point(),
                          ui::EventTimeForNow(), ui::EF_IS_SYNTHESIZED, 0);
   generator.Dispatch(&mouseev);
   EXPECT_EQ("10,10",
             Env::GetInstance()->last_mouse_location().ToString());
 
   generator.MoveMouseTo(0, 0);
   EXPECT_EQ("0,0",
             Env::GetInstance()->last_mouse_location().ToString());
 
   // Make sure the location gets updated when a syntheiszed enter
   // event destroyed the window.
   SelfDestructDelegate delegate;
-  scoped_ptr<aura::Window> window(CreateTestWindowWithDelegate(
+  std::unique_ptr<aura::Window> window(CreateTestWindowWithDelegate(
       &delegate, 1, gfx::Rect(50, 50, 100, 100), root_window()));
   delegate.set_window(std::move(window));
   EXPECT_TRUE(delegate.has_window());
 
   generator.MoveMouseTo(100, 100);
   EXPECT_FALSE(delegate.has_window());
   EXPECT_EQ("100,100",
             Env::GetInstance()->last_mouse_location().ToString());
 }
 
 // Tests that the window which has capture can get destroyed as a result of
 // ui::ET_MOUSE_CAPTURE_CHANGED event dispatched in
 // WindowEventDispatcher::UpdateCapture without causing a "use after free".
 TEST_F(WindowEventDispatcherTest, DestroyWindowOnCaptureChanged) {
   SelfDestructDelegate delegate;
-  scoped_ptr<aura::Window> window_first(CreateTestWindowWithDelegate(
+  std::unique_ptr<aura::Window> window_first(CreateTestWindowWithDelegate(
       &delegate, 1, gfx::Rect(20, 10, 10, 20), root_window()));
   Window* window_first_raw = window_first.get();
   window_first->Show();
   window_first->SetCapture();
   delegate.set_window(std::move(window_first));
   EXPECT_TRUE(delegate.has_window());
 
-  scoped_ptr<aura::Window> window_second(
+  std::unique_ptr<aura::Window> window_second(
       test::CreateTestWindowWithId(2, root_window()));
   window_second->Show();
 
   client::CaptureDelegate* capture_delegate = host()->dispatcher();
   capture_delegate->UpdateCapture(window_first_raw, window_second.get());
   EXPECT_FALSE(delegate.has_window());
 }
 
 class StaticFocusClient : public client::FocusClient {
  public:
@@ skipping 11 matching lines @@
 
   Window* focused_;
 
   DISALLOW_COPY_AND_ASSIGN(StaticFocusClient);
 };
 
 // Tests that host-cancel-mode event can be dispatched to a dispatcher safely
 // when the focused window does not live in the dispatcher's tree.
 TEST_F(WindowEventDispatcherTest, HostCancelModeWithFocusedWindowOutside) {
   test::TestWindowDelegate delegate;
-  scoped_ptr<Window> focused(CreateTestWindowWithDelegate(&delegate, 123,
-      gfx::Rect(20, 30, 100, 50), NULL));
+  std::unique_ptr<Window> focused(CreateTestWindowWithDelegate(
+      &delegate, 123, gfx::Rect(20, 30, 100, 50), NULL));
   StaticFocusClient focus_client(focused.get());
   client::SetFocusClient(root_window(), &focus_client);
   EXPECT_FALSE(root_window()->Contains(focused.get()));
   EXPECT_EQ(focused.get(),
             client::GetFocusClient(root_window())->GetFocusedWindow());
   host()->dispatcher()->DispatchCancelModeEvent();
   EXPECT_EQ(focused.get(),
             client::GetFocusClient(root_window())->GetFocusedWindow());
 }
 
@@ skipping 50 matching lines @@
   Window* window_to_move_;
   Window* root_window_to_move_to_;
 
   DISALLOW_COPY_AND_ASSIGN(MoveWindowHandler);
 };
 
 // Tests that nested event dispatch works correctly if the target of the older
 // event being dispatched is moved to a different dispatcher in response to an
 // event in the inner loop.
 TEST_F(WindowEventDispatcherTest, NestedEventDispatchTargetMoved) {
-  scoped_ptr<WindowTreeHost> second_host(
+  std::unique_ptr<WindowTreeHost> second_host(
       WindowTreeHost::Create(gfx::Rect(20, 30, 100, 50)));
   second_host->InitHost();
   Window* second_root = second_host->window();
 
   // Create two windows parented to |root_window()|.
   test::TestWindowDelegate delegate;
-  scoped_ptr<Window> first(CreateTestWindowWithDelegate(&delegate, 123,
-      gfx::Rect(20, 10, 10, 20), root_window()));
-  scoped_ptr<Window> second(CreateTestWindowWithDelegate(&delegate, 234,
-      gfx::Rect(40, 10, 50, 20), root_window()));
+  std::unique_ptr<Window> first(CreateTestWindowWithDelegate(
+      &delegate, 123, gfx::Rect(20, 10, 10, 20), root_window()));
+  std::unique_ptr<Window> second(CreateTestWindowWithDelegate(
+      &delegate, 234, gfx::Rect(40, 10, 50, 20), root_window()));
 
   // Setup a handler on |first| so that it dispatches an event to |second| when
   // |first| receives an event.
   DispatchEventHandler dispatch_event(second.get());
   first->AddPreTargetHandler(&dispatch_event);
 
   // Setup a handler on |second| so that it moves |first| into |second_root|
   // when |second| receives an event.
   MoveWindowHandler move_window(first.get(), second_root);
   second->AddPreTargetHandler(&move_window);
@@ skipping 27 matching lines @@
  private:
   // InputStateLookup:
   bool IsMouseButtonDown() const override { return true; }
 
   DISALLOW_COPY_AND_ASSIGN(AlwaysMouseDownInputStateLookup);
 };
 
 TEST_F(WindowEventDispatcherTest,
        CursorVisibilityChangedWhileCaptureWindowInAnotherDispatcher) {
   test::EventCountDelegate delegate;
-  scoped_ptr<Window> window(CreateTestWindowWithDelegate(&delegate, 123,
-      gfx::Rect(20, 10, 10, 20), root_window()));
+  std::unique_ptr<Window> window(CreateTestWindowWithDelegate(
+      &delegate, 123, gfx::Rect(20, 10, 10, 20), root_window()));
   window->Show();
 
-  scoped_ptr<WindowTreeHost> second_host(
+  std::unique_ptr<WindowTreeHost> second_host(
       WindowTreeHost::Create(gfx::Rect(20, 30, 100, 50)));
   second_host->InitHost();
   WindowEventDispatcher* second_dispatcher = second_host->dispatcher();
 
   // Install an InputStateLookup on the Env that always claims that a
   // mouse-button is down.
-  test::EnvTestHelper(Env::GetInstance()).SetInputStateLookup(
-      scoped_ptr<InputStateLookup>(new AlwaysMouseDownInputStateLookup()));
+  test::EnvTestHelper(Env::GetInstance())
+      .SetInputStateLookup(std::unique_ptr<InputStateLookup>(
+          new AlwaysMouseDownInputStateLookup()));
 
   window->SetCapture();
 
   // Because the mouse button is down, setting the capture on |window| will set
   // it as the mouse-move handler for |root_window()|.
   EXPECT_EQ(window.get(), host()->dispatcher()->mouse_moved_handler());
 
   // This does not set |window| as the mouse-move handler for the second
   // dispatcher.
   EXPECT_EQ(NULL, second_dispatcher->mouse_moved_handler());
@@ skipping 10 matching lines @@
 
   // Notify both hosts that the cursor is now hidden. This should send a single
   // mouse-exit event to |window|.
   host()->OnCursorVisibilityChanged(false);
   second_host->OnCursorVisibilityChanged(false);
   EXPECT_EQ("0 0 1", delegate.GetMouseMotionCountsAndReset());
 }
 
 TEST_F(WindowEventDispatcherTest,
        RedirectedEventToDifferentDispatcherLocation) {
-  scoped_ptr<WindowTreeHost> second_host(
+  std::unique_ptr<WindowTreeHost> second_host(
       WindowTreeHost::Create(gfx::Rect(20, 30, 100, 50)));
   second_host->InitHost();
   client::SetCaptureClient(second_host->window(),
                            client::GetCaptureClient(root_window()));
 
   test::EventCountDelegate delegate;
-  scoped_ptr<Window> window_first(CreateTestWindowWithDelegate(&delegate, 123,
-      gfx::Rect(20, 10, 10, 20), root_window()));
+  std::unique_ptr<Window> window_first(CreateTestWindowWithDelegate(
+      &delegate, 123, gfx::Rect(20, 10, 10, 20), root_window()));
   window_first->Show();
 
-  scoped_ptr<Window> window_second(CreateTestWindowWithDelegate(&delegate, 12,
-      gfx::Rect(10, 10, 20, 30), second_host->window()));
+  std::unique_ptr<Window> window_second(CreateTestWindowWithDelegate(
+      &delegate, 12, gfx::Rect(10, 10, 20, 30), second_host->window()));
   window_second->Show();
 
   window_second->SetCapture();
   EXPECT_EQ(window_second.get(),
             client::GetCaptureWindow(root_window()));
 
   // Send an event to the first host. Make sure it goes to |window_second| in
   // |second_host| instead (since it has capture).
   EventFilterRecorder recorder_first;
   window_first->AddPreTargetHandler(&recorder_first);
@@ skipping 39 matching lines @@
 // co-ordinates in the right co-ordinate space.
 TEST_F(WindowEventDispatcherTest, GestureEventCoordinates) {
   const float kX = 67.3f;
   const float kY = 97.8f;
 
   const int kWindowOffset = 50;
   EventFilterRecorder recorder;
   root_window()->AddPreTargetHandler(&recorder);
   AsyncWindowDelegate delegate(host()->dispatcher());
   HoldPointerOnScrollHandler handler(host()->dispatcher(), &recorder);
-  scoped_ptr<aura::Window> window(CreateTestWindowWithDelegate(
-      &delegate,
-      1,
-      gfx::Rect(kWindowOffset, kWindowOffset, 100, 100),
+  std::unique_ptr<aura::Window> window(CreateTestWindowWithDelegate(
+      &delegate, 1, gfx::Rect(kWindowOffset, kWindowOffset, 100, 100),
       root_window()));
   window->AddPreTargetHandler(&handler);
 
   delegate.set_window(window.get());
 
   ui::TouchEvent touch_pressed_event(ui::ET_TOUCH_PRESSED, gfx::Point(), 0,
                                      ui::EventTimeForNow());
   touch_pressed_event.set_location_f(gfx::PointF(kX, kY));
   touch_pressed_event.set_root_location_f(gfx::PointF(kX, kY));
 
@@ skipping 55 matching lines @@
   root_window()->RemovePreTargetHandler(&recorder);
 }
 
 // OnCursorMovedToRootLocation() is sometimes called instead of
 // WindowTreeHost::MoveCursorTo() when the cursor did not move but the
 // cursor's position in root coordinates has changed (e.g. when the displays's
 // scale factor changed). Test that hover effects are properly updated.
 TEST_F(WindowEventDispatcherTest, OnCursorMovedToRootLocationUpdatesHover) {
   WindowEventDispatcher* dispatcher = host()->dispatcher();
 
-  scoped_ptr<Window> w(CreateNormalWindow(1, root_window(), nullptr));
+  std::unique_ptr<Window> w(CreateNormalWindow(1, root_window(), nullptr));
   w->SetBounds(gfx::Rect(20, 20, 20, 20));
   w->Show();
 
   // Move the cursor off of |w|.
   dispatcher->OnCursorMovedToRootLocation(gfx::Point(100, 100));
 
   EventFilterRecorder recorder;
   w->AddPreTargetHandler(&recorder);
   dispatcher->OnCursorMovedToRootLocation(gfx::Point(22, 22));
   RunAllPendingInMessageLoop();
   EXPECT_TRUE(recorder.HasReceivedEvent(ui::ET_MOUSE_ENTERED));
   recorder.Reset();
 
   // The cursor should not be over |w| after changing the device scale factor to
   // 2x. A ET_MOUSE_EXITED event should have been sent to |w|.
   test_screen()->SetDeviceScaleFactor(2.f);
   dispatcher->OnCursorMovedToRootLocation(gfx::Point(11, 11));
   RunAllPendingInMessageLoop();
   EXPECT_TRUE(recorder.HasReceivedEvent(ui::ET_MOUSE_EXITED));
 
   w->RemovePreTargetHandler(&recorder);
 }
 
 }  // namespace aura