Convert //ash from scoped_ptr to std::unique_ptr

ash/display/screen_position_controller_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/display/screen_position_controller.h"
 

[oshima, 2016/04/08 07:09:40]

include?

 #include "ash/display/display_manager.h"
 #include "ash/screen_util.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/shell_test_api.h"
 #include "ui/aura/env.h"
 #include "ui/aura/test/test_window_delegate.h"
 #include "ui/aura/window_tracker.h"
 #include "ui/aura/window_tree_host.h"
@@ skipping 19 matching lines @@
 #define MAYBE_ConvertToScreenWhileRemovingSecondaryDisplay \
   ConvertToScreenWhileRemovingSecondaryDisplay
 #endif
 
 namespace ash {
 namespace test {
 
 namespace {
 
 void SetSecondaryDisplayLayout(display::DisplayPlacement::Position position) {
-  scoped_ptr<display::DisplayLayout> layout(Shell::GetInstance()
-                                                ->display_manager()
-                                                ->GetCurrentDisplayLayout()
-                                                .Copy());
+  std::unique_ptr<display::DisplayLayout> layout(Shell::GetInstance()
+                                                     ->display_manager()
+                                                     ->GetCurrentDisplayLayout()
+                                                     .Copy());
   layout->placement_list[0].position = position;
   Shell::GetInstance()->display_manager()->SetLayoutForCurrentDisplays(
       std::move(layout));
 }
 
 ScreenPositionController* GetScreenPositionController() {
   ShellTestApi test_api(Shell::GetInstance());
   return test_api.screen_position_controller();
 }
 
@@ skipping 19 matching lines @@
   // Converts a point (x, y) in host window's coordinate to screen and
   // returns its string representation.
   std::string ConvertHostPointToScreen(int x, int y) const {
     gfx::Point point(x, y);
     GetScreenPositionController()->ConvertHostPointToScreen(
         window_->GetRootWindow(), &point);
     return point.ToString();
   }
 
  protected:
-  scoped_ptr<aura::Window> window_;
+  std::unique_ptr<aura::Window> window_;
   aura::test::TestWindowDelegate window_delegate_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ScreenPositionControllerTest);
 };
 
 }  // namespace
 
 TEST_F(ScreenPositionControllerTest, MAYBE_ConvertHostPointToScreen) {
   // Make sure that the point is in host coordinates. (crbug.com/521919)
@@ skipping 234 matching lines @@
   // We want to check that none of these synthetic events are dispatched after
   // ScreenPositionClient has been detached from the root window.
   GetEventGenerator().MoveMouseTo(800, 200);
   EXPECT_TRUE(window_->GetBoundsInScreen().Contains(
       aura::Env::GetInstance()->last_mouse_location()));
 
   aura::Window::Windows root_windows =
       Shell::GetInstance()->GetAllRootWindows();
   aura::WindowTracker tracker;
   tracker.Add(root_windows[1]);
-  scoped_ptr<ConvertToScreenEventHandler> event_handler(
+  std::unique_ptr<ConvertToScreenEventHandler> event_handler(
       new ConvertToScreenEventHandler);
 
   // Remove the secondary monitor.
   UpdateDisplay("600x600");
 
   // The secondary root window is not immediately destroyed.
   EXPECT_TRUE(tracker.Contains(root_windows[1]));
 
   RunAllPendingInMessageLoop();
 
   // Check that we waited long enough and that the secondary root window was
   // destroyed.
   EXPECT_FALSE(tracker.Contains(root_windows[1]));
 
   // Check that we could convert all of the mouse events we got to screen
   // coordinates.
   EXPECT_TRUE(event_handler->could_convert_to_screen());
 }
 
 }  // namespace test
 }  // namespace ash