Convert //chrome/browser/ui from scoped_ptr to std::unique_ptr

chrome/browser/ui/panels/panel_drag_browsertest.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 "base/message_loop/message_loop.h"
 #include "build/build_config.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/ui/panels/base_panel_browser_test.h"
 #include "chrome/browser/ui/panels/detached_panel_collection.h"
 #include "chrome/browser/ui/panels/docked_panel_collection.h"
@@ skipping 14 matching lines @@
     // All the tests here assume using mocked 800x600 display area for the
     // primary monitor. Do the check now.
     gfx::Rect primary_display_area = PanelManager::GetInstance()->
         display_settings_provider()->GetPrimaryDisplayArea();
     DCHECK(primary_display_area.width() == 800);
     DCHECK(primary_display_area.height() == 600);
   }
 
   // Drag |panel| from its origin by the offset |delta|.
   void DragPanelByDelta(Panel* panel, const gfx::Vector2d& delta) {
-    scoped_ptr<NativePanelTesting> panel_testing(
+    std::unique_ptr<NativePanelTesting> panel_testing(
         CreateNativePanelTesting(panel));
     gfx::Point mouse_location(panel->GetBounds().origin());
     panel_testing->PressLeftMouseButtonTitlebar(mouse_location);
     panel_testing->DragTitlebar(mouse_location + delta);
     panel_testing->FinishDragTitlebar();
   }
 
   // Drag |panel| from its origin to |new_mouse_location|.
   void DragPanelToMouseLocation(Panel* panel,
                                 const gfx::Point& new_mouse_location) {
-    scoped_ptr<NativePanelTesting> panel_testing(
+    std::unique_ptr<NativePanelTesting> panel_testing(
         CreateNativePanelTesting(panel));
     gfx::Point mouse_location(panel->GetBounds().origin());
     panel_testing->PressLeftMouseButtonTitlebar(panel->GetBounds().origin());
     panel_testing->DragTitlebar(new_mouse_location);
     panel_testing->FinishDragTitlebar();
   }
 
   // Return the bounds of a panel given its initial bounds and the bounds of the
   // panel above it.
   static gfx::Rect GetStackedAtBottomPanelBounds(
@@ skipping 123 matching lines @@
     return gfx::Vector2d(
         PanelDragController::GetGluePanelDistanceThresholdForTesting() * 2, 0);
   }
 };
 
 IN_PROC_BROWSER_TEST_F(PanelDragBrowserTest, DragOneDockedPanel) {
   static const int big_delta_x = 70;
   static const int big_delta_y = 30;  // Do not exceed the threshold to detach.
 
   Panel* panel = CreateDockedPanel("1", gfx::Rect(0, 0, 100, 100));
-  scoped_ptr<NativePanelTesting> panel_testing(
+  std::unique_ptr<NativePanelTesting> panel_testing(
       CreateNativePanelTesting(panel));
   gfx::Rect panel_old_bounds = panel->GetBounds();
 
   // Drag left.
   gfx::Point mouse_location = panel_old_bounds.origin();
   panel_testing->PressLeftMouseButtonTitlebar(mouse_location);
   EXPECT_EQ(panel_old_bounds, panel->GetBounds());
 
   mouse_location.Offset(-big_delta_x, 0);
   panel_testing->DragTitlebar(mouse_location);
@@ skipping 71 matching lines @@
   EXPECT_EQ(panel_old_bounds, panel->GetBounds());
 
   PanelManager::GetInstance()->CloseAll();
 }
 
 IN_PROC_BROWSER_TEST_F(PanelDragBrowserTest, DragTwoDockedPanels) {
   static const gfx::Vector2d small_delta(10, 0);
 
   Panel* panel1 = CreateDockedPanel("1", gfx::Rect(0, 0, 100, 100));
   Panel* panel2 = CreateDockedPanel("2", gfx::Rect(0, 0, 100, 100));
-  scoped_ptr<NativePanelTesting> panel1_testing(
+  std::unique_ptr<NativePanelTesting> panel1_testing(
       CreateNativePanelTesting(panel1));
-  scoped_ptr<NativePanelTesting> panel2_testing(
+  std::unique_ptr<NativePanelTesting> panel2_testing(
       CreateNativePanelTesting(panel2));
   gfx::Point position1 = panel1->GetBounds().origin();
   gfx::Point position2 = panel2->GetBounds().origin();
 
   // Drag right panel towards left with small delta.
   // Expect no shuffle: P1 P2
   gfx::Point mouse_location = position1;
   panel1_testing->PressLeftMouseButtonTitlebar(mouse_location);
   EXPECT_EQ(position1, panel1->GetBounds().origin());
   EXPECT_EQ(position2, panel2->GetBounds().origin());
@@ skipping 72 matching lines @@
   EXPECT_EQ(position1, panel1->GetBounds().origin());
   EXPECT_EQ(position2, panel2->GetBounds().origin());
 
   PanelManager::GetInstance()->CloseAll();
 }
 
 IN_PROC_BROWSER_TEST_F(PanelDragBrowserTest, DragThreeDockedPanels) {
   Panel* panel1 = CreateDockedPanel("1", gfx::Rect(0, 0, 100, 100));
   Panel* panel2 = CreateDockedPanel("2", gfx::Rect(0, 0, 100, 100));
   Panel* panel3 = CreateDockedPanel("3", gfx::Rect(0, 0, 100, 100));
-  scoped_ptr<NativePanelTesting> panel2_testing(
+  std::unique_ptr<NativePanelTesting> panel2_testing(
       CreateNativePanelTesting(panel2));
-  scoped_ptr<NativePanelTesting> panel3_testing(
+  std::unique_ptr<NativePanelTesting> panel3_testing(
       CreateNativePanelTesting(panel3));
   gfx::Point position1 = panel1->GetBounds().origin();
   gfx::Point position2 = panel2->GetBounds().origin();
   gfx::Point position3 = panel3->GetBounds().origin();
 
   // Drag leftmost panel to become the rightmost in 2 drags. Each drag will
   // shuffle one panel.
   // Expect shuffle after 1st drag: P1 P3 P2
   // Expect shuffle after 2nd drag: P3 P1 P2
   gfx::Point mouse_location = position3;
@@ skipping 108 matching lines @@
   panel3_testing->CancelDragTitlebar();
   EXPECT_EQ(position2, panel1->GetBounds().origin());
   EXPECT_EQ(position3, panel2->GetBounds().origin());
   EXPECT_EQ(position1, panel3->GetBounds().origin());
 
   PanelManager::GetInstance()->CloseAll();
 }
 
 IN_PROC_BROWSER_TEST_F(PanelDragBrowserTest, DragMinimizedPanel) {
   Panel* panel = CreatePanel("panel1");
-  scoped_ptr<NativePanelTesting> panel_testing(
+  std::unique_ptr<NativePanelTesting> panel_testing(
       CreateNativePanelTesting(panel));
 
   panel->Minimize();
   EXPECT_EQ(Panel::MINIMIZED, panel->expansion_state());
 
   // Hover over minimized panel to bring up titlebar.
   gfx::Point hover_point(panel->GetBounds().origin());
   MoveMouseAndWaitForExpansionStateChange(panel, hover_point);
   EXPECT_EQ(Panel::TITLE_ONLY, panel->expansion_state());
 
@@ skipping 18 matching lines @@
 
   MoveMouseAndWaitForExpansionStateChange(panel, mouse_location);
   EXPECT_EQ(Panel::MINIMIZED, panel->expansion_state());
 
   panel->Close();
 }
 
 IN_PROC_BROWSER_TEST_F(PanelDragBrowserTest,
                        DragMinimizedPanelWhileDrawingAttention) {
   Panel* panel = CreatePanel("panel1");
-  scoped_ptr<NativePanelTesting> panel_testing(
+  std::unique_ptr<NativePanelTesting> panel_testing(
       CreateNativePanelTesting(panel));
   CreatePanel("panel2");
 
   panel->Minimize();
   EXPECT_EQ(Panel::MINIMIZED, panel->expansion_state());
 
   panel->FlashFrame(true);
   EXPECT_TRUE(panel->IsDrawingAttention());
   EXPECT_EQ(Panel::TITLE_ONLY, panel->expansion_state());
 
@@ skipping 38 matching lines @@
   DockedPanelCollection* docked_collection = panel_manager->docked_collection();
 
   // Create 4 docked panels.
   // We have:  P4  P3  P2  P1
   Panel* panel1 = CreatePanelWithBounds("Panel1", gfx::Rect(0, 0, 100, 100));
   Panel* panel2 = CreatePanelWithBounds("Panel2", gfx::Rect(0, 0, 100, 100));
   Panel* panel3 = CreatePanelWithBounds("Panel3", gfx::Rect(0, 0, 100, 100));
   Panel* panel4 = CreatePanelWithBounds("Panel4", gfx::Rect(0, 0, 100, 100));
   ASSERT_EQ(4, docked_collection->num_panels());
 
-  scoped_ptr<NativePanelTesting> panel1_testing(
+  std::unique_ptr<NativePanelTesting> panel1_testing(
       CreateNativePanelTesting(panel1));
   gfx::Point position1 = panel1->GetBounds().origin();
   gfx::Point position2 = panel2->GetBounds().origin();
   gfx::Point position3 = panel3->GetBounds().origin();
   gfx::Point position4 = panel4->GetBounds().origin();
 
   // Test the scenario: drag a panel, close another panel, cancel the drag.
   {
     std::vector<Panel*> panels;
     gfx::Point panel1_new_position = position1;
@@ skipping 150 matching lines @@
 #if defined(OS_MACOSX)
 #define MAYBE_DragOneDetachedPanel DISABLED_DragOneDetachedPanel
 #else
 #define MAYBE_DragOneDetachedPanel DragOneDetachedPanel
 #endif
 IN_PROC_BROWSER_TEST_F(PanelDragBrowserTest, MAYBE_DragOneDetachedPanel) {
   Panel* panel = CreateDetachedPanel("1", gfx::Rect(300, 200, 250, 200));
 
   // Test that the detached panel can be dragged almost anywhere except getting
   // close to the bottom of the docked area to trigger the attach.
-  scoped_ptr<NativePanelTesting> panel_testing(
+  std::unique_ptr<NativePanelTesting> panel_testing(
       CreateNativePanelTesting(panel));
   gfx::Point origin = panel->GetBounds().origin();
 
   panel_testing->PressLeftMouseButtonTitlebar(origin);
   EXPECT_EQ(origin, panel->GetBounds().origin());
 
   origin.Offset(-51, -102);
   panel_testing->DragTitlebar(origin);
   EXPECT_EQ(origin, panel->GetBounds().origin());
 
@@ skipping 30 matching lines @@
 IN_PROC_BROWSER_TEST_F(PanelDragBrowserTest, CloseDetachedPanelOnDrag) {
   PanelManager* panel_manager = PanelManager::GetInstance();
   PanelDragController* drag_controller = panel_manager->drag_controller();
   DetachedPanelCollection* detached_collection =
       panel_manager->detached_collection();
 
   // Create 1 detached panel.
   Panel* panel1 = CreateDetachedPanel("1", gfx::Rect(100, 200, 100, 100));
   ASSERT_EQ(1, detached_collection->num_panels());
 
-  scoped_ptr<NativePanelTesting> panel1_testing(
+  std::unique_ptr<NativePanelTesting> panel1_testing(
       CreateNativePanelTesting(panel1));
   gfx::Point panel1_old_position = panel1->GetBounds().origin();
 
   // Test the scenario: drag a panel, close another panel, cancel the drag.
   {
     // Create a panel to be closed.
     Panel* panel2 = CreateDetachedPanel("2", gfx::Rect(300, 210, 110, 110));
 
     // Start dragging a panel.
     panel1_testing->PressLeftMouseButtonTitlebar(panel1->GetBounds().origin());
@@ skipping 97 matching lines @@
       panel_manager->detached_collection();
 
   // Create one docked panel.
   Panel* panel = CreateDockedPanel("1", gfx::Rect(0, 0, 100, 100));
   ASSERT_EQ(1, docked_collection->num_panels());
   ASSERT_EQ(0, detached_collection->num_panels());
 
   gfx::Rect panel_old_bounds = panel->GetBounds();
 
   // Press on title-bar.
-  scoped_ptr<NativePanelTesting> panel_testing(
+  std::unique_ptr<NativePanelTesting> panel_testing(
       CreateNativePanelTesting(panel));
   gfx::Point mouse_location(panel->GetBounds().origin());
   panel_testing->PressLeftMouseButtonTitlebar(mouse_location);
 
   // Drag up the panel in a small offset that does not trigger the detach.
   // Expect that the panel is still docked and only x coordinate of its position
   // is changed.
   gfx::Vector2d drag_delta_to_remain_docked = GetDragDeltaToRemainDocked();
   mouse_location = mouse_location + drag_delta_to_remain_docked;
   panel_testing->DragTitlebar(mouse_location);
@@ skipping 41 matching lines @@
       panel_manager->detached_collection();
 
   // Create one docked panel.
   Panel* panel = CreateDockedPanel("1", gfx::Rect(0, 0, 100, 100));
   ASSERT_EQ(1, docked_collection->num_panels());
   ASSERT_EQ(0, detached_collection->num_panels());
 
   gfx::Rect panel_old_bounds = panel->GetBounds();
 
   // Press on title-bar.
-  scoped_ptr<NativePanelTesting> panel_testing(
+  std::unique_ptr<NativePanelTesting> panel_testing(
       CreateNativePanelTesting(panel));
   gfx::Point mouse_location(panel->GetBounds().origin());
   panel_testing->PressLeftMouseButtonTitlebar(mouse_location);
 
   // Drag up the panel in a small offset that does not trigger the detach.
   // Expect that the panel is still docked and only x coordinate of its position
   // is changed.
   gfx::Vector2d drag_delta_to_remain_docked = GetDragDeltaToRemainDocked();
   mouse_location = mouse_location + drag_delta_to_remain_docked;
   panel_testing->DragTitlebar(mouse_location);
@@ skipping 42 matching lines @@
 
   // Create one detached panel.
   Panel* panel = CreateDetachedPanel("1", gfx::Rect(400, 300, 100, 100));
   ASSERT_EQ(0, docked_collection->num_panels());
   ASSERT_EQ(1, detached_collection->num_panels());
   EXPECT_EQ(PanelCollection::DETACHED, panel->collection()->type());
 
   gfx::Rect panel_old_bounds = panel->GetBounds();
 
   // Press on title-bar.
-  scoped_ptr<NativePanelTesting> panel_testing(
+  std::unique_ptr<NativePanelTesting> panel_testing(
       CreateNativePanelTesting(panel));
   gfx::Point mouse_location(panel->GetBounds().origin());
   panel_testing->PressLeftMouseButtonTitlebar(mouse_location);
 
   // Drag down the panel but not close enough to the bottom of work area.
   // Expect that the panel is still detached.
   gfx::Vector2d drag_delta_to_remain_detached =
       GetDragDeltaToRemainDetached(panel);
   mouse_location = mouse_location + drag_delta_to_remain_detached;
   panel_testing->DragTitlebar(mouse_location);
@@ skipping 45 matching lines @@
 
   // Create one detached panel.
   Panel* panel = CreateDetachedPanel("1", gfx::Rect(400, 300, 100, 100));
   ASSERT_EQ(0, docked_collection->num_panels());
   ASSERT_EQ(1, detached_collection->num_panels());
   EXPECT_EQ(PanelCollection::DETACHED, panel->collection()->type());
 
   gfx::Rect panel_old_bounds = panel->GetBounds();
 
   // Press on title-bar.
-  scoped_ptr<NativePanelTesting> panel_testing(
+  std::unique_ptr<NativePanelTesting> panel_testing(
       CreateNativePanelTesting(panel));
   gfx::Point mouse_location(panel->GetBounds().origin());
   panel_testing->PressLeftMouseButtonTitlebar(mouse_location);
 
   // Drag down the panel but not close enough to the bottom of work area.
   // Expect that the panel is still detached.
   gfx::Vector2d drag_delta_to_remain_detached =
       GetDragDeltaToRemainDetached(panel);
   mouse_location = mouse_location + drag_delta_to_remain_detached;
   panel_testing->DragTitlebar(mouse_location);
@@ skipping 34 matching lines @@
       panel_manager->detached_collection();
 
   // Create one docked panel.
   Panel* panel = CreateDockedPanel("1", gfx::Rect(0, 0, 100, 100));
   ASSERT_EQ(1, docked_collection->num_panels());
   ASSERT_EQ(0, detached_collection->num_panels());
 
   gfx::Rect panel_old_bounds = panel->GetBounds();
 
   // Press on title-bar.
-  scoped_ptr<NativePanelTesting> panel_testing(
+  std::unique_ptr<NativePanelTesting> panel_testing(
       CreateNativePanelTesting(panel));
   gfx::Point mouse_location(panel->GetBounds().origin());
   panel_testing->PressLeftMouseButtonTitlebar(mouse_location);
 
   // Drag up the panel to trigger the detach.
   // Expect that the panel is previewed as detached.
   gfx::Vector2d drag_delta_to_detach = GetDragDeltaToDetach();
   mouse_location = mouse_location + drag_delta_to_detach;
   panel_testing->DragTitlebar(mouse_location);
   ASSERT_EQ(0, docked_collection->num_panels());
@@ skipping 332 matching lines @@
   Panel* panel2 = CreateDetachedPanel("2", gfx::Rect(100, 100, 150, 150));
   ASSERT_EQ(2, detached_collection->num_panels());
   ASSERT_EQ(0, panel_manager->num_stacks());
   EXPECT_EQ(PanelCollection::DETACHED, panel1->collection()->type());
   EXPECT_EQ(PanelCollection::DETACHED, panel2->collection()->type());
 
   gfx::Rect panel1_old_bounds = panel1->GetBounds();
   gfx::Rect panel2_old_bounds = panel2->GetBounds();
 
   // Press on title-bar of P2.
-  scoped_ptr<NativePanelTesting> panel2_testing(
+  std::unique_ptr<NativePanelTesting> panel2_testing(
       CreateNativePanelTesting(panel2));
   gfx::Point mouse_location(panel2->GetBounds().origin());
   gfx::Point original_mouse_location = mouse_location;
   panel2_testing->PressLeftMouseButtonTitlebar(mouse_location);
 
   // Drag P2 close to the bottom of P1 to trigger the stacking. Expect:
   // 1) P1 and P2 form a stack.
   // 2) P2 jumps vertcially to align to the bottom edge of P1.
   // 3) P2 moves horizontally by the dragging delta.
   // 4) The width of P2 remains unchanged.
@@ skipping 86 matching lines @@
   Panel* panel2 = CreateDetachedPanel("2", gfx::Rect(100, 200, 150, 150));
   ASSERT_EQ(2, detached_collection->num_panels());
   ASSERT_EQ(0, panel_manager->num_stacks());
   EXPECT_EQ(PanelCollection::DETACHED, panel1->collection()->type());
   EXPECT_EQ(PanelCollection::DETACHED, panel2->collection()->type());
 
   gfx::Rect panel1_old_bounds = panel1->GetBounds();
   gfx::Rect panel2_old_bounds = panel2->GetBounds();
 
   // Press on title-bar of P2.
-  scoped_ptr<NativePanelTesting> panel2_testing(
+  std::unique_ptr<NativePanelTesting> panel2_testing(
       CreateNativePanelTesting(panel2));
   gfx::Point mouse_location(panel2->GetBounds().origin());
   gfx::Point original_mouse_location = mouse_location;
   panel2_testing->PressLeftMouseButtonTitlebar(mouse_location);
 
   // Drag P2 close to the top of P1 to trigger the stacking. Expect:
   // 1) P2 and P1 form a stack.
   // 2) P2 jumps vertcially to align to the top edge of P1.
   // 3) P2 moves horizontally by the dragging delta.
   // 4) The width of both P1 and P2 remains unchanged.
@@ skipping 87 matching lines @@
   Panel* panel2 = CreateDetachedPanel("2", gfx::Rect(100, 100, 150, 150));
   ASSERT_EQ(2, detached_collection->num_panels());
   ASSERT_EQ(0, panel_manager->num_stacks());
   EXPECT_EQ(PanelCollection::DETACHED, panel1->collection()->type());
   EXPECT_EQ(PanelCollection::DETACHED, panel2->collection()->type());
 
   gfx::Rect panel1_old_bounds = panel1->GetBounds();
   gfx::Rect panel2_old_bounds = panel2->GetBounds();
 
   // Press on title-bar.
-  scoped_ptr<NativePanelTesting> panel2_testing(
+  std::unique_ptr<NativePanelTesting> panel2_testing(
       CreateNativePanelTesting(panel2));
   gfx::Point mouse_location(panel2->GetBounds().origin());
   gfx::Point original_mouse_location = mouse_location;
   panel2_testing->PressLeftMouseButtonTitlebar(mouse_location);
 
   // Drag P2 close to the bottom of P1 to trigger the stacking.
   // Expect that P2 stacks to P1 and P2's width remains unchanged.
   gfx::Vector2d drag_delta_to_stack =
       GetDragDeltaToStackToBottom(panel2, panel1);
   mouse_location = mouse_location + drag_delta_to_stack;
@@ skipping 422 matching lines @@
   EXPECT_EQ(stack, panel2->stack());
 
   gfx::Rect panel1_expected_bounds(panel1_initial_bounds);
   EXPECT_EQ(panel1_expected_bounds, panel1->GetBounds());
   gfx::Rect panel2_expected_bounds = GetStackedAtBottomPanelBounds(
       panel2_initial_bounds, panel1_expected_bounds);
   EXPECT_EQ(panel2_expected_bounds, panel2->GetBounds());
   gfx::Rect panel2_old_bounds = panel2_expected_bounds;
 
   // Press on title-bar.
-  scoped_ptr<NativePanelTesting> panel2_testing(
+  std::unique_ptr<NativePanelTesting> panel2_testing(
       CreateNativePanelTesting(panel2));
   gfx::Point mouse_location(panel2->GetBounds().origin());
   gfx::Point original_mouse_location = mouse_location;
   panel2_testing->PressLeftMouseButtonTitlebar(mouse_location);
 
   // Drag P2 away from the bottom of P1 to trigger the unstacking.
   // Expect that P1 and P2 get detached.
   gfx::Vector2d drag_delta_to_unstack =
       GetDragDeltaToUnstackFromBottom(panel2, panel1);
   mouse_location = mouse_location + drag_delta_to_unstack;
@@ skipping 68 matching lines @@
   EXPECT_EQ(stack, panel2->stack());
 
   gfx::Rect panel1_expected_bounds(panel1_initial_bounds);
   EXPECT_EQ(panel1_expected_bounds, panel1->GetBounds());
   gfx::Rect panel2_expected_bounds = GetStackedAtBottomPanelBounds(
       panel2_initial_bounds, panel1_expected_bounds);
   EXPECT_EQ(panel2_expected_bounds, panel2->GetBounds());
   gfx::Rect panel2_old_bounds = panel2->GetBounds();
 
   // Press on title-bar.
-  scoped_ptr<NativePanelTesting> panel2_testing(
+  std::unique_ptr<NativePanelTesting> panel2_testing(
       CreateNativePanelTesting(panel2));
   gfx::Point mouse_location(panel2->GetBounds().origin());
   gfx::Point original_mouse_location = mouse_location;
   panel2_testing->PressLeftMouseButtonTitlebar(mouse_location);
 
   // Drag P2 away from the bottom of P1 to trigger the unstacking.
   // Expect that P1 and P2 get detached.
   gfx::Vector2d drag_delta_to_unstack =
       GetDragDeltaToUnstackFromBottom(panel2, panel1);
   mouse_location = mouse_location + drag_delta_to_unstack;
@@ skipping 296 matching lines @@
   gfx::Rect panel2_initial_bounds = gfx::Rect(100, 100, 100, 250);
   Panel* panel2 = CreateDetachedPanel("2", panel2_initial_bounds);
   ASSERT_EQ(2, detached_collection->num_panels());
 
   gfx::Rect panel1_expected_bounds(panel1_initial_bounds);
   EXPECT_EQ(panel1_expected_bounds, panel1->GetBounds());
   gfx::Rect panel2_expected_bounds(panel2_initial_bounds);
   EXPECT_EQ(panel2_expected_bounds, panel2->GetBounds());
 
   // Press on title-bar.
-  scoped_ptr<NativePanelTesting> panel2_testing(
+  std::unique_ptr<NativePanelTesting> panel2_testing(
       CreateNativePanelTesting(panel2));
   gfx::Point mouse_location(panel2->GetBounds().origin());
   gfx::Point original_mouse_location = mouse_location;
   panel2_testing->PressLeftMouseButtonTitlebar(mouse_location);
 
   // Drag P2 close to the left of P1 to trigger the snapping.
   gfx::Vector2d drag_delta_to_snap = GetDragDeltaToSnapToLeft(panel2, panel1);
   mouse_location = mouse_location + drag_delta_to_snap;
   panel2_testing->DragTitlebar(mouse_location);
   ASSERT_EQ(2, detached_collection->num_panels());
@@ skipping 55 matching lines @@
   gfx::Rect panel2_initial_bounds = gfx::Rect(300, 100, 200, 250);
   Panel* panel2 = CreateDetachedPanel("2", panel2_initial_bounds);
   ASSERT_EQ(2, detached_collection->num_panels());
 
   gfx::Rect panel1_expected_bounds(panel1_initial_bounds);
   EXPECT_EQ(panel1_expected_bounds, panel1->GetBounds());
   gfx::Rect panel2_expected_bounds(panel2_initial_bounds);
   EXPECT_EQ(panel2_expected_bounds, panel2->GetBounds());
 
   // Press on title-bar.
-  scoped_ptr<NativePanelTesting> panel2_testing(
+  std::unique_ptr<NativePanelTesting> panel2_testing(
       CreateNativePanelTesting(panel2));
   gfx::Point mouse_location(panel2->GetBounds().origin());
   gfx::Point original_mouse_location = mouse_location;
   panel2_testing->PressLeftMouseButtonTitlebar(mouse_location);
 
   // Drag P1 close to the right of P2 to trigger the snapping.
   gfx::Vector2d drag_delta_to_snap = GetDragDeltaToSnapToRight(panel2, panel1);
   mouse_location = mouse_location + drag_delta_to_snap;
   panel2_testing->DragTitlebar(mouse_location);
   ASSERT_EQ(2, detached_collection->num_panels());
@@ skipping 53 matching lines @@
   gfx::Rect panel2_initial_bounds = gfx::Rect(100, 100, 100, 250);
   Panel* panel2 = CreateDetachedPanel("2", panel2_initial_bounds);
   ASSERT_EQ(2, detached_collection->num_panels());
 
   gfx::Rect panel1_expected_bounds(panel1_initial_bounds);
   EXPECT_EQ(panel1_expected_bounds, panel1->GetBounds());
   gfx::Rect panel2_expected_bounds(panel2_initial_bounds);
   EXPECT_EQ(panel2_expected_bounds, panel2->GetBounds());
 
   // Press on title-bar.
-  scoped_ptr<NativePanelTesting> panel2_testing(
+  std::unique_ptr<NativePanelTesting> panel2_testing(
       CreateNativePanelTesting(panel2));
   gfx::Point mouse_location(panel2->GetBounds().origin());
   gfx::Point original_mouse_location = mouse_location;
   panel2_testing->PressLeftMouseButtonTitlebar(mouse_location);
 
   // Drag P2 close to the left of P1 to trigger the snapping.
   gfx::Vector2d drag_delta_to_snap = GetDragDeltaToSnapToLeft(panel2, panel1);
   mouse_location = mouse_location + drag_delta_to_snap;
   panel2_testing->DragTitlebar(mouse_location);
   ASSERT_EQ(2, detached_collection->num_panels());
@@ skipping 318 matching lines @@
   expected_x = secondary_work_area.x();
   panel1_expected_bounds.set_x(expected_x);
   panel1_expected_bounds.set_y(secondary_work_area.y());
   EXPECT_EQ(panel1_expected_bounds, panel1->GetBounds());
   panel2_expected_bounds.set_x(expected_x);
   panel2_expected_bounds.set_y(panel1_expected_bounds.bottom());
   EXPECT_EQ(panel2_expected_bounds, panel2->GetBounds());
 
   panel_manager->CloseAll();
 }