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

Unified Diff: ash/accelerators/accelerator_controller_unittest.cc

Issue 1551133002: Convert Pass()→std::move() in //ash (CrOS edition) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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 | « no previous file | ash/accelerators/accelerator_filter_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/accelerators/accelerator_controller_unittest.cc
diff --git a/ash/accelerators/accelerator_controller_unittest.cc b/ash/accelerators/accelerator_controller_unittest.cc
index 738bf485c36b5ec78eab3416d424388bad478e9e..b9304b6b1f530ad5a580ff8c5070dc658b923c20 100644
--- a/ash/accelerators/accelerator_controller_unittest.cc
+++ b/ash/accelerators/accelerator_controller_unittest.cc
@@ -868,7 +868,7 @@ TEST_F(AcceleratorControllerTest, GlobalAccelerators) {
{
TestVolumeControlDelegate* delegate = new TestVolumeControlDelegate;
ash::Shell::GetInstance()->system_tray_delegate()->SetVolumeControlDelegate(
- scoped_ptr<VolumeControlDelegate>(delegate).Pass());
+ scoped_ptr<VolumeControlDelegate>(delegate));
EXPECT_EQ(0, delegate->handle_volume_mute_count());
EXPECT_TRUE(ProcessInController(volume_mute));
EXPECT_EQ(1, delegate->handle_volume_mute_count());
@@ -890,7 +890,7 @@ TEST_F(AcceleratorControllerTest, GlobalAccelerators) {
DummyBrightnessControlDelegate* delegate =
new DummyBrightnessControlDelegate;
GetController()->SetBrightnessControlDelegate(
- scoped_ptr<BrightnessControlDelegate>(delegate).Pass());
+ scoped_ptr<BrightnessControlDelegate>(delegate));
EXPECT_EQ(0, delegate->handle_brightness_down_count());
EXPECT_TRUE(ProcessInController(brightness_down));
EXPECT_EQ(1, delegate->handle_brightness_down_count());
@@ -912,7 +912,7 @@ TEST_F(AcceleratorControllerTest, GlobalAccelerators) {
DummyKeyboardBrightnessControlDelegate* delegate =
new DummyKeyboardBrightnessControlDelegate;
GetController()->SetKeyboardBrightnessControlDelegate(
- scoped_ptr<KeyboardBrightnessControlDelegate>(delegate).Pass());
+ scoped_ptr<KeyboardBrightnessControlDelegate>(delegate));
EXPECT_EQ(0, delegate->handle_keyboard_brightness_down_count());
EXPECT_TRUE(ProcessInController(alt_brightness_down));
EXPECT_EQ(1, delegate->handle_keyboard_brightness_down_count());
@@ -1146,7 +1146,7 @@ TEST_F(AcceleratorControllerTest, ImeGlobalAccelerators) {
DummyImeControlDelegate* delegate = new DummyImeControlDelegate;
GetController()->SetImeControlDelegate(
- scoped_ptr<ImeControlDelegate>(delegate).Pass());
+ scoped_ptr<ImeControlDelegate>(delegate));
EXPECT_EQ(0, delegate->handle_next_ime_count());
EXPECT_FALSE(ProcessInController(shift_alt_press));
EXPECT_TRUE(ProcessInController(shift_alt));
@@ -1408,7 +1408,7 @@ TEST_F(AcceleratorControllerTest, DisallowedAtModalWindow) {
DummyBrightnessControlDelegate* delegate =
new DummyBrightnessControlDelegate;
GetController()->SetBrightnessControlDelegate(
- scoped_ptr<BrightnessControlDelegate>(delegate).Pass());
+ scoped_ptr<BrightnessControlDelegate>(delegate));
EXPECT_EQ(0, delegate->handle_brightness_down_count());
EXPECT_TRUE(ProcessInController(brightness_down));
EXPECT_EQ(1, delegate->handle_brightness_down_count());
@@ -1428,7 +1428,7 @@ TEST_F(AcceleratorControllerTest, DisallowedAtModalWindow) {
EXPECT_TRUE(ProcessInController(volume_up));
TestVolumeControlDelegate* delegate = new TestVolumeControlDelegate;
ash::Shell::GetInstance()->system_tray_delegate()->SetVolumeControlDelegate(
- scoped_ptr<VolumeControlDelegate>(delegate).Pass());
+ scoped_ptr<VolumeControlDelegate>(delegate));
EXPECT_EQ(0, delegate->handle_volume_mute_count());
EXPECT_TRUE(ProcessInController(volume_mute));
EXPECT_EQ(1, delegate->handle_volume_mute_count());
@@ -1495,7 +1495,7 @@ class DeprecatedAcceleratorTester : public AcceleratorControllerTest {
// For testing the deprecated and new IME shortcuts.
DummyImeControlDelegate* delegate = new DummyImeControlDelegate;
GetController()->SetImeControlDelegate(
- scoped_ptr<ImeControlDelegate>(delegate).Pass());
+ scoped_ptr<ImeControlDelegate>(delegate));
}
ui::Accelerator CreateAccelerator(const AcceleratorData& data) const {
« no previous file with comments | « no previous file | ash/accelerators/accelerator_filter_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698