Convert //ash from scoped_ptr to std::unique_ptr

ash/wm/window_manager_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 "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/test_activation_delegate.h"
 #include "ash/wm/window_util.h"
 #include "ui/aura/client/cursor_client_observer.h"
@@ skipping 124 matching lines @@
   // The IME event filter interferes with the basic key event propagation we
   // attempt to do here, so we disable it.
   //
   DisableIME();
   aura::Window* root_window = Shell::GetPrimaryRootWindow();
   root_window->SetBounds(gfx::Rect(0, 0, 510, 510));
 
   // Supplied ids are negative so as not to collide with shell ids.
   // TODO(beng): maybe introduce a MAKE_SHELL_ID() macro that generates a safe
   //             id beyond shell id max?
-  scoped_ptr<aura::Window> w1(CreateTestWindowInShell(
-      SK_ColorWHITE, -1, gfx::Rect(10, 10, 500, 500)));
-  scoped_ptr<aura::Window> w11(aura::test::CreateTestWindow(
+  std::unique_ptr<aura::Window> w1(
+      CreateTestWindowInShell(SK_ColorWHITE, -1, gfx::Rect(10, 10, 500, 500)));
+  std::unique_ptr<aura::Window> w11(aura::test::CreateTestWindow(
       SK_ColorGREEN, -11, gfx::Rect(5, 5, 100, 100), w1.get()));
-  scoped_ptr<aura::Window> w111(aura::test::CreateTestWindow(
+  std::unique_ptr<aura::Window> w111(aura::test::CreateTestWindow(
       SK_ColorCYAN, -111, gfx::Rect(5, 5, 75, 75), w11.get()));
-  scoped_ptr<aura::Window> w1111(aura::test::CreateTestWindow(
+  std::unique_ptr<aura::Window> w1111(aura::test::CreateTestWindow(
       SK_ColorRED, -1111, gfx::Rect(5, 5, 50, 50), w111.get()));
-  scoped_ptr<aura::Window> w12(aura::test::CreateTestWindow(
+  std::unique_ptr<aura::Window> w12(aura::test::CreateTestWindow(
       SK_ColorMAGENTA, -12, gfx::Rect(10, 420, 25, 25), w1.get()));
   aura::test::ColorTestWindowDelegate* w121delegate =
       new aura::test::ColorTestWindowDelegate(SK_ColorYELLOW);
-  scoped_ptr<aura::Window> w121(aura::test::CreateTestWindowWithDelegate(
+  std::unique_ptr<aura::Window> w121(aura::test::CreateTestWindowWithDelegate(
       w121delegate, -121, gfx::Rect(5, 5, 5, 5), w12.get()));
   aura::test::ColorTestWindowDelegate* w122delegate =
       new aura::test::ColorTestWindowDelegate(SK_ColorRED);
-  scoped_ptr<aura::Window> w122(aura::test::CreateTestWindowWithDelegate(
+  std::unique_ptr<aura::Window> w122(aura::test::CreateTestWindowWithDelegate(
       w122delegate, -122, gfx::Rect(10, 5, 5, 5), w12.get()));
   aura::test::ColorTestWindowDelegate* w123delegate =
       new aura::test::ColorTestWindowDelegate(SK_ColorRED);
-  scoped_ptr<aura::Window> w123(aura::test::CreateTestWindowWithDelegate(
+  std::unique_ptr<aura::Window> w123(aura::test::CreateTestWindowWithDelegate(
       w123delegate, -123, gfx::Rect(15, 5, 5, 5), w12.get()));
-  scoped_ptr<aura::Window> w13(aura::test::CreateTestWindow(
+  std::unique_ptr<aura::Window> w13(aura::test::CreateTestWindow(
       SK_ColorGRAY, -13, gfx::Rect(5, 470, 50, 50), w1.get()));
 
   // Click on a sub-window (w121) to focus it.
   ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow(), w121.get());
   generator.ClickLeftButton();
 
   aura::client::FocusClient* focus_client =
       aura::client::GetFocusClient(w121.get());
   EXPECT_EQ(w121.get(), focus_client->GetFocusedWindow());
 
@@ skipping 78 matching lines @@
   // the windows.
   aura::client::SetActivationDelegate(w1.get(), NULL);
 }
 
 // Various assertion testing for activating windows.
 TEST_F(WindowManagerTest, ActivateOnMouse) {
   aura::Window* root_window = Shell::GetPrimaryRootWindow();
 
   test::TestActivationDelegate d1;
   aura::test::TestWindowDelegate wd;
-  scoped_ptr<aura::Window> w1(CreateTestWindowInShellWithDelegate(
-      &wd, -1, gfx::Rect(10, 10, 50, 50)));
+  std::unique_ptr<aura::Window> w1(
+      CreateTestWindowInShellWithDelegate(&wd, -1, gfx::Rect(10, 10, 50, 50)));
   d1.SetWindow(w1.get());
   test::TestActivationDelegate d2;
-  scoped_ptr<aura::Window> w2(CreateTestWindowInShellWithDelegate(
-      &wd, -2, gfx::Rect(70, 70, 50, 50)));
+  std::unique_ptr<aura::Window> w2(
+      CreateTestWindowInShellWithDelegate(&wd, -2, gfx::Rect(70, 70, 50, 50)));
   d2.SetWindow(w2.get());
 
   aura::client::FocusClient* focus_client =
       aura::client::GetFocusClient(w1.get());
 
   d1.Clear();
   d2.Clear();
 
   // Activate window1.
   wm::ActivateWindow(w1.get());
@@ skipping 42 matching lines @@
   EXPECT_EQ(0, d2.activated_count());
   EXPECT_EQ(1, d2.lost_active_count());
   EXPECT_TRUE(wm::IsActiveWindow(w1.get()));
   EXPECT_EQ(w1.get(), focus_client->GetFocusedWindow());
   EXPECT_EQ(1, d1.activated_count());
   EXPECT_EQ(0, d1.lost_active_count());
 
   // Clicking an active window with a child shouldn't steal the
   // focus from the child.
   {
-    scoped_ptr<aura::Window> w11(CreateTestWindowWithDelegate(
-          &wd, -11, gfx::Rect(10, 10, 10, 10), w1.get()));
+    std::unique_ptr<aura::Window> w11(CreateTestWindowWithDelegate(
+        &wd, -11, gfx::Rect(10, 10, 10, 10), w1.get()));
     ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow(),
                                        w11.get());
     // First set the focus to the child |w11|.
     generator.ClickLeftButton();
     EXPECT_EQ(w11.get(), focus_client->GetFocusedWindow());
     EXPECT_EQ(w1.get(), wm::GetActiveWindow());
 
     // Then click the parent active window. The focus shouldn't move.
     gfx::Point left_top = w1->bounds().origin();
     aura::Window::ConvertPointToTarget(w1->parent(), root_window, &left_top);
     left_top.Offset(1, 1);
     generator.MoveMouseTo(left_top);
     generator.ClickLeftButton();
     EXPECT_EQ(w11.get(), focus_client->GetFocusedWindow());
     EXPECT_EQ(w1.get(), wm::GetActiveWindow());
   }
 
   // Clicking on a non-focusable window inside a background window should still
   // give focus to the background window.
   {
     NonFocusableDelegate nfd;
-    scoped_ptr<aura::Window> w11(CreateTestWindowWithDelegate(
-          &nfd, -1, gfx::Rect(10, 10, 10, 10), w1.get()));
+    std::unique_ptr<aura::Window> w11(CreateTestWindowWithDelegate(
+        &nfd, -1, gfx::Rect(10, 10, 10, 10), w1.get()));
     // Move focus to |w2| first.
-    scoped_ptr<aura::Window> w2(CreateTestWindowInShellWithDelegate(
-          &wd, -1, gfx::Rect(70, 70, 50, 50)));
+    std::unique_ptr<aura::Window> w2(CreateTestWindowInShellWithDelegate(
+        &wd, -1, gfx::Rect(70, 70, 50, 50)));
     ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow(), w2.get());
     generator.ClickLeftButton();
     EXPECT_EQ(w2.get(), focus_client->GetFocusedWindow());
     EXPECT_FALSE(w11->CanFocus());
 
     // Click on |w11|. This should focus w1.
     generator.MoveMouseToCenterOf(w11.get());
     generator.ClickLeftButton();
     EXPECT_EQ(w1.get(), focus_client->GetFocusedWindow());
   }
 }
 
 TEST_F(WindowManagerTest, PanelActivation) {
   aura::test::TestWindowDelegate wd;
-  scoped_ptr<aura::Window> w1(CreateTestWindowInShellWithDelegate(
-      &wd, -1, gfx::Rect(10, 10, 50, 50)));
+  std::unique_ptr<aura::Window> w1(
+      CreateTestWindowInShellWithDelegate(&wd, -1, gfx::Rect(10, 10, 50, 50)));
   aura::test::TestWindowDelegate pd;
-  scoped_ptr<aura::Window> p1(CreateTestWindowInShellWithDelegateAndType(
+  std::unique_ptr<aura::Window> p1(CreateTestWindowInShellWithDelegateAndType(
       &pd, ui::wm::WINDOW_TYPE_PANEL, -1, gfx::Rect(10, 10, 50, 50)));
   aura::client::FocusClient* focus_client =
       aura::client::GetFocusClient(w1.get());
 
   // Activate w1.
   wm::ActivateWindow(w1.get());
   EXPECT_TRUE(wm::IsActiveWindow(w1.get()));
 
   // Activate p1.
   wm::ActivateWindow(p1.get());
   EXPECT_TRUE(wm::IsActiveWindow(p1.get()));
   EXPECT_EQ(p1.get(), focus_client->GetFocusedWindow());
 
   // Activate w1.
   wm::ActivateWindow(w1.get());
   EXPECT_TRUE(wm::IsActiveWindow(w1.get()));
   EXPECT_EQ(w1.get(), focus_client->GetFocusedWindow());
 
   // Clicking on a non-activatable window should not change the active window.
   {
     NonFocusableDelegate nfd;
-    scoped_ptr<aura::Window> w3(CreateTestWindowInShellWithDelegate(
-          &nfd, -1, gfx::Rect(70, 70, 50, 50)));
+    std::unique_ptr<aura::Window> w3(CreateTestWindowInShellWithDelegate(
+        &nfd, -1, gfx::Rect(70, 70, 50, 50)));
     ui::test::EventGenerator generator3(Shell::GetPrimaryRootWindow(),
                                         w3.get());
     wm::ActivateWindow(p1.get());
     EXPECT_TRUE(wm::IsActiveWindow(p1.get()));
     generator3.ClickLeftButton();
     EXPECT_TRUE(wm::IsActiveWindow(p1.get()));
   }
 }
 
 // Essentially the same as ActivateOnMouse, but for touch events.
 TEST_F(WindowManagerTest, ActivateOnTouch) {
   aura::Window* root_window = Shell::GetPrimaryRootWindow();
 
   test::TestActivationDelegate d1;
   aura::test::TestWindowDelegate wd;
-  scoped_ptr<aura::Window> w1(CreateTestWindowInShellWithDelegate(
-      &wd, -1, gfx::Rect(10, 10, 50, 50)));
+  std::unique_ptr<aura::Window> w1(
+      CreateTestWindowInShellWithDelegate(&wd, -1, gfx::Rect(10, 10, 50, 50)));
   d1.SetWindow(w1.get());
   test::TestActivationDelegate d2;
-  scoped_ptr<aura::Window> w2(CreateTestWindowInShellWithDelegate(
-      &wd, -2, gfx::Rect(70, 70, 50, 50)));
+  std::unique_ptr<aura::Window> w2(
+      CreateTestWindowInShellWithDelegate(&wd, -2, gfx::Rect(70, 70, 50, 50)));
   d2.SetWindow(w2.get());
 
   aura::client::FocusClient* focus_client =
       aura::client::GetFocusClient(w1.get());
 
   d1.Clear();
   d2.Clear();
 
   // Activate window1.
   wm::ActivateWindow(w1.get());
@@ skipping 51 matching lines @@
   EXPECT_EQ(0, d1.lost_active_count());
 }
 
 TEST_F(WindowManagerTest, MouseEventCursors) {
   aura::Window* root_window = Shell::GetPrimaryRootWindow();
 
   // Create a window.
   const int kWindowLeft = 123;
   const int kWindowTop = 45;
   HitTestWindowDelegate window_delegate;
-  scoped_ptr<aura::Window> window(CreateTestWindowInShellWithDelegate(
-    &window_delegate,
-    -1,
-    gfx::Rect(kWindowLeft, kWindowTop, 640, 480)));
+  std::unique_ptr<aura::Window> window(CreateTestWindowInShellWithDelegate(
+      &window_delegate, -1, gfx::Rect(kWindowLeft, kWindowTop, 640, 480)));
 
   // Create two mouse movement events we can switch between.
   gfx::Point point1(kWindowLeft, kWindowTop);
   aura::Window::ConvertPointToTarget(window->parent(), root_window, &point1);
 
   gfx::Point point2(kWindowLeft + 1, kWindowTop + 1);
   aura::Window::ConvertPointToTarget(window->parent(), root_window, &point2);
 
   aura::WindowTreeHost* host = root_window->GetHost();
   ui::EventProcessor* dispatcher = host->event_processor();
@@ skipping 100 matching lines @@
                 .ToString());
 
   // Rotate it clock-wise 90 degrees.
   gfx::Transform transform;
   transform.Translate(size.width(), 0);
   transform.Rotate(90.0f);
   root_window->GetHost()->SetRootTransform(transform);
 
   test::TestActivationDelegate d1;
   aura::test::TestWindowDelegate wd;
-  scoped_ptr<aura::Window> w1(
+  std::unique_ptr<aura::Window> w1(
       CreateTestWindowInShellWithDelegate(&wd, 1, gfx::Rect(0, 15, 50, 50)));
   d1.SetWindow(w1.get());
   w1->Show();
 
   gfx::Point miss_point(5, 5);
   transform.TransformPoint(&miss_point);
   ui::MouseEvent mouseev1(ui::ET_MOUSE_PRESSED, miss_point, miss_point,
                           ui::EventTimeForNow(), ui::EF_LEFT_MOUSE_BUTTON,
                           ui::EF_LEFT_MOUSE_BUTTON);
   ui::EventProcessor* dispatcher = root_window->GetHost()->event_processor();
@@ skipping 18 matching lines @@
             aura::client::GetFocusClient(w1.get())->GetFocusedWindow());
 }
 
 TEST_F(WindowManagerTest, AdditionalFilters) {
   // The IME event filter interferes with the basic key event propagation we
   // attempt to do here, so we disable it.
   DisableIME();
   aura::Window* root_window = Shell::GetPrimaryRootWindow();
 
   // Creates a window and make it active
-  scoped_ptr<aura::Window> w1(CreateTestWindowInShell(
-      SK_ColorWHITE, -1, gfx::Rect(0, 0, 100, 100)));
+  std::unique_ptr<aura::Window> w1(
+      CreateTestWindowInShell(SK_ColorWHITE, -1, gfx::Rect(0, 0, 100, 100)));
   wm::ActivateWindow(w1.get());
 
   // Creates two addition filters
-  scoped_ptr<CustomEventHandler> f1(new CustomEventHandler);
-  scoped_ptr<CustomEventHandler> f2(new CustomEventHandler);
+  std::unique_ptr<CustomEventHandler> f1(new CustomEventHandler);
+  std::unique_ptr<CustomEventHandler> f2(new CustomEventHandler);
 
   // Adds them to root window event filter.
   ::wm::CompoundEventFilter* env_filter =
       Shell::GetInstance()->env_filter();
   env_filter->AddHandler(f1.get());
   env_filter->AddHandler(f2.get());
 
   // Dispatches mouse and keyboard events.
   ui::KeyEvent key_event(ui::ET_KEY_PRESSED, ui::VKEY_A, ui::EF_NONE);
   ui::EventProcessor* dispatcher = root_window->GetHost()->event_processor();
@@ skipping 117 matching lines @@
   generator.ReleaseKey(ui::VKEY_CONTROL, ui::EF_NONE);
   generator.ReleaseKey(ui::VKEY_A, ui::EF_NONE);
   EXPECT_TRUE(cursor_manager->IsCursorVisible());
 }
 
 TEST_F(WindowManagerTest, TestCursorClientObserver) {
   ui::test::EventGenerator& generator = GetEventGenerator();
   ::wm::CursorManager* cursor_manager =
       ash::Shell::GetInstance()->cursor_manager();
 
-  scoped_ptr<aura::Window> w1(CreateTestWindowInShell(
-      SK_ColorWHITE, -1, gfx::Rect(0, 0, 100, 100)));
+  std::unique_ptr<aura::Window> w1(
+      CreateTestWindowInShell(SK_ColorWHITE, -1, gfx::Rect(0, 0, 100, 100)));
   wm::ActivateWindow(w1.get());
 
   // Add two observers. Both should have OnCursorVisibilityChanged()
   // invoked when an event changes the visibility of the cursor.
   TestingCursorClientObserver observer_a;
   TestingCursorClientObserver observer_b;
   cursor_manager->AddObserver(&observer_a);
   cursor_manager->AddObserver(&observer_b);
 
   // Initial state before any events have been sent.
@@ skipping 38 matching lines @@
   generator.MoveMouseTo(50, 50);
   EXPECT_TRUE(observer_a.did_visibility_change());
   EXPECT_FALSE(observer_b.did_visibility_change());
   EXPECT_TRUE(observer_a.is_cursor_visible());
 
   cursor_manager->RemoveObserver(&observer_a);
 }
 #endif  // defined(OS_CHROMEOS)
 
 }  // namespace ash