Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1451)

Unified Diff: ui/views/controls/button/menu_button_unittest.cc

Issue 1868363002: Replace scoped_ptr with std::unique_ptr in //ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@scopedptrcc
Patch Set: scopedptrui: rebase-make_scoped_ptr Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/views/controls/button/md_text_button.h ('k') | ui/views/controls/combobox/combobox.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/controls/button/menu_button_unittest.cc
diff --git a/ui/views/controls/button/menu_button_unittest.cc b/ui/views/controls/button/menu_button_unittest.cc
index fdfc4d0a9b4965830aee1e5ff8a825ff291ec6f4..86ee12b061c249bf12fb4b4a346411c4a8e46755 100644
--- a/ui/views/controls/button/menu_button_unittest.cc
+++ b/ui/views/controls/button/menu_button_unittest.cc
@@ -4,8 +4,9 @@
#include "ui/views/controls/button/menu_button.h"
+#include <memory>
+
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/strings/utf_string_conversions.h"
#include "build/build_config.h"
#include "ui/base/dragdrop/drag_drop_types.h"
@@ -104,7 +105,7 @@ class MenuButtonTest : public ViewsTestBase {
Widget* widget_;
TestMenuButton* button_;
- scoped_ptr<ui::test::EventGenerator> generator_;
+ std::unique_ptr<ui::test::EventGenerator> generator_;
DISALLOW_COPY_AND_ASSIGN(MenuButtonTest);
};
@@ -184,7 +185,7 @@ class PressStateMenuButtonListener : public MenuButtonListener {
private:
MenuButton* menu_button_;
- scoped_ptr<MenuButton::PressedLock> pressed_lock_;
+ std::unique_ptr<MenuButton::PressedLock> pressed_lock_;
// The |pressed_lock_| will be released when true.
bool release_lock_;
@@ -349,7 +350,7 @@ TEST_F(MenuButtonTest, ButtonStateForMenuButtonsWithPressedLocks) {
EXPECT_EQ(Button::STATE_HOVERED, button()->state());
// Introduce a PressedLock, which should make the button pressed.
- scoped_ptr<MenuButton::PressedLock> pressed_lock1(
+ std::unique_ptr<MenuButton::PressedLock> pressed_lock1(
new MenuButton::PressedLock(button()));
EXPECT_EQ(Button::STATE_PRESSED, button()->state());
@@ -358,7 +359,7 @@ TEST_F(MenuButtonTest, ButtonStateForMenuButtonsWithPressedLocks) {
EXPECT_EQ(Button::STATE_PRESSED, button()->state());
// Creating a new lock should obviously keep the button pressed.
- scoped_ptr<MenuButton::PressedLock> pressed_lock2(
+ std::unique_ptr<MenuButton::PressedLock> pressed_lock2(
new MenuButton::PressedLock(button()));
EXPECT_EQ(Button::STATE_PRESSED, button()->state());
@@ -483,12 +484,12 @@ TEST_F(MenuButtonTest, InkDropStateForMenuButtonsWithPressedLocks) {
TestInkDropDelegate ink_drop_delegate;
button()->set_ink_drop_delegate(&ink_drop_delegate);
- scoped_ptr<MenuButton::PressedLock> pressed_lock1(
+ std::unique_ptr<MenuButton::PressedLock> pressed_lock1(
new MenuButton::PressedLock(button()));
EXPECT_EQ(InkDropState::ACTIVATED, ink_drop_delegate.state());
- scoped_ptr<MenuButton::PressedLock> pressed_lock2(
+ std::unique_ptr<MenuButton::PressedLock> pressed_lock2(
new MenuButton::PressedLock(button()));
EXPECT_EQ(InkDropState::ACTIVATED, ink_drop_delegate.state());
@@ -507,13 +508,13 @@ TEST_F(MenuButtonTest, OneInkDropAnimationForReentrantPressedLocks) {
TestInkDropDelegate ink_drop_delegate;
button()->set_ink_drop_delegate(&ink_drop_delegate);
- scoped_ptr<MenuButton::PressedLock> pressed_lock1(
+ std::unique_ptr<MenuButton::PressedLock> pressed_lock1(
new MenuButton::PressedLock(button()));
EXPECT_EQ(InkDropState::ACTIVATED, ink_drop_delegate.state());
ink_drop_delegate.OnAction(InkDropState::ACTION_PENDING);
- scoped_ptr<MenuButton::PressedLock> pressed_lock2(
+ std::unique_ptr<MenuButton::PressedLock> pressed_lock2(
new MenuButton::PressedLock(button()));
EXPECT_EQ(InkDropState::ACTION_PENDING, ink_drop_delegate.state());
« no previous file with comments | « ui/views/controls/button/md_text_button.h ('k') | ui/views/controls/combobox/combobox.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698