Replace scoped_ptr with std::unique_ptr in //ui

ui/views/controls/button/custom_button_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/views/controls/button/custom_button.h"
 
 #include "base/macros.h"
+#include "base/memory/ptr_util.h"
 #include "build/build_config.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/layout.h"
 #include "ui/base/material_design/material_design_controller.h"
 #include "ui/events/event_utils.h"
 #include "ui/events/test/event_generator.h"
 #include "ui/gfx/screen.h"
 #include "ui/views/animation/ink_drop_delegate.h"
 #include "ui/views/animation/ink_drop_host.h"
 #include "ui/views/animation/test/test_ink_drop_delegate.h"
@@ skipping 98 matching lines @@
  private:
   bool* ink_shown_;
   bool* ink_hidden_;
 
   DISALLOW_COPY_AND_ASSIGN(TestInkDropDelegateThatTracksVisibilty);
 };
 
 // A test Button class that owns a TestInkDropDelegate.
 class TestButtonWithInkDrop : public TestCustomButton {
  public:
-  TestButtonWithInkDrop(scoped_ptr<InkDropDelegate> ink_drop_delegate)
+  TestButtonWithInkDrop(std::unique_ptr<InkDropDelegate> ink_drop_delegate)
       : TestCustomButton(), ink_drop_delegate_(std::move(ink_drop_delegate)) {
     set_ink_drop_delegate(ink_drop_delegate_.get());
   }
   ~TestButtonWithInkDrop() override {}
 
  private:
-  scoped_ptr<views::InkDropDelegate> ink_drop_delegate_;
+  std::unique_ptr<views::InkDropDelegate> ink_drop_delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(TestButtonWithInkDrop);
 };
 
 }  // namespace
 
 class CustomButtonTest : public ViewsTestBase {
  public:
   CustomButtonTest() {}
   ~CustomButtonTest() override {}
@@ skipping 12 matching lines @@
 
     button_ = new TestCustomButton();
     widget_->SetContentsView(button_);
   }
 
   void TearDown() override {
     widget_.reset();
     ViewsTestBase::TearDown();
   }
 
-  void CreateButtonWithInkDrop(scoped_ptr<InkDropDelegate> ink_drop_delegate) {
+  void CreateButtonWithInkDrop(
+      std::unique_ptr<InkDropDelegate> ink_drop_delegate) {
     delete button_;
     button_ = new TestButtonWithInkDrop(std::move(ink_drop_delegate));
     widget_->SetContentsView(button_);
   }
 
  protected:
   Widget* widget() { return widget_.get(); }
   TestCustomButton* button() { return button_; }
   void SetDraggedView(View* dragged_view) {
     widget_->dragged_view_ = dragged_view;
   }
 
  private:
-  scoped_ptr<Widget> widget_;
+  std::unique_ptr<Widget> widget_;
   TestCustomButton* button_;
 
   DISALLOW_COPY_AND_ASSIGN(CustomButtonTest);
 };
 
 // Tests that hover state changes correctly when visiblity/enableness changes.
 TEST_F(CustomButtonTest, HoverStateOnVisibilityChange) {
   ui::test::EventGenerator generator(GetContext(), widget()->GetNativeWindow());
 
   generator.PressLeftButton();
@@ skipping 195 matching lines @@
 }
 
 // Tests that pressing a button shows the ink drop and releasing the button
 // does not hide the ink drop.
 // Note: Ink drop is not hidden upon release because CustomButton descendants
 // may enter a different ink drop state.
 TEST_F(CustomButtonTest, ButtonClickTogglesInkDrop) {
   gfx::Point old_cursor = gfx::Screen::GetScreen()->GetCursorScreenPoint();
   bool ink_shown = false;
   bool ink_hidden = false;
-  CreateButtonWithInkDrop(make_scoped_ptr(
+  CreateButtonWithInkDrop(base::WrapUnique(
       new TestInkDropDelegateThatTracksVisibilty(&ink_shown, &ink_hidden)));
 
   ui::test::EventGenerator generator(GetContext(), widget()->GetNativeWindow());
   generator.set_current_location(gfx::Point(50, 50));
   generator.PressLeftButton();
   EXPECT_TRUE(ink_shown);
   EXPECT_FALSE(ink_hidden);
 
   generator.ReleaseLeftButton();
   EXPECT_FALSE(ink_hidden);
 }
 
 // Tests that pressing a button shows and releasing capture hides ink drop.
 // Releasing capture should also reset PRESSED button state to NORMAL.
 TEST_F(CustomButtonTest, CaptureLossHidesInkDrop) {
   gfx::Point old_cursor = gfx::Screen::GetScreen()->GetCursorScreenPoint();
   bool ink_shown = false;
   bool ink_hidden = false;
-  CreateButtonWithInkDrop(make_scoped_ptr(
+  CreateButtonWithInkDrop(base::WrapUnique(
       new TestInkDropDelegateThatTracksVisibilty(&ink_shown, &ink_hidden)));
 
   ui::test::EventGenerator generator(GetContext(), widget()->GetNativeWindow());
   generator.set_current_location(gfx::Point(50, 50));
   generator.PressLeftButton();
   EXPECT_TRUE(ink_shown);
   EXPECT_FALSE(ink_hidden);
 
   EXPECT_EQ(Button::ButtonState::STATE_PRESSED, button()->state());
   SetDraggedView(button());
   widget()->SetCapture(button());
   widget()->ReleaseCapture();
   SetDraggedView(nullptr);
   EXPECT_TRUE(ink_hidden);
   EXPECT_EQ(ui::MaterialDesignController::IsModeMaterial()
                 ? Button::ButtonState::STATE_NORMAL
                 : Button::ButtonState::STATE_PRESSED,
             button()->state());
 }
 
 TEST_F(CustomButtonTest, InkDropAfterShowingContextMenu) {
   TestInkDropDelegate* ink_drop_delegate = new TestInkDropDelegate();
-  CreateButtonWithInkDrop(make_scoped_ptr(ink_drop_delegate));
+  CreateButtonWithInkDrop(base::WrapUnique(ink_drop_delegate));
   TestContextMenuController context_menu_controller;
   button()->set_context_menu_controller(&context_menu_controller);
 
   ink_drop_delegate->SetHovered(true);
   ink_drop_delegate->OnAction(InkDropState::ACTION_PENDING);
 
   button()->ShowContextMenu(gfx::Point(), ui::MENU_SOURCE_MOUSE);
 
   EXPECT_FALSE(ink_drop_delegate->is_hovered());
   EXPECT_EQ(InkDropState::HIDDEN, ink_drop_delegate->state());
 }
 
 TEST_F(CustomButtonTest, InkDropAfterTryingToShowContextMenu) {
   TestInkDropDelegate* ink_drop_delegate = new TestInkDropDelegate();
-  CreateButtonWithInkDrop(make_scoped_ptr(ink_drop_delegate));
+  CreateButtonWithInkDrop(base::WrapUnique(ink_drop_delegate));
   button()->set_context_menu_controller(nullptr);
 
   ink_drop_delegate->SetHovered(true);
   ink_drop_delegate->OnAction(InkDropState::ACTION_PENDING);
 
   button()->ShowContextMenu(gfx::Point(), ui::MENU_SOURCE_MOUSE);
 
   EXPECT_TRUE(ink_drop_delegate->is_hovered());
   EXPECT_EQ(InkDropState::ACTION_PENDING, ink_drop_delegate->state());
 }
 
 }  // namespace views