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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/accelerators/accelerator_controller_unittest.cc

Issue 1867223004: Convert //ash from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
« ash/accelerators/accelerator_commands_unittest.cc ('K') | « ash/accelerators/accelerator_controller.cc ('k') | ash/accelerators/accelerator_filter_unittest.cc » ('j') | ash/ash_touch_exploration_manager_chromeos.h » ('J')
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 7965068fc10868d60dbba3b4dca934847cec81bc..9a696779eea67f56b6084ec93a854343ab620f5c 100644
--- a/ash/accelerators/accelerator_controller_unittest.cc
+++ b/ash/accelerators/accelerator_controller_unittest.cc
@@ -440,7 +440,7 @@ TEST_F(AcceleratorControllerTest, IsRegistered) {
}
TEST_F(AcceleratorControllerTest, WindowSnap) {
- scoped_ptr<aura::Window> window(
+ std::unique_ptr<aura::Window> window(
CreateTestWindowInShellWithBounds(gfx::Rect(5, 5, 20, 20)));
wm::WindowState* window_state = wm::GetWindowState(window.get());
@@ -494,10 +494,10 @@ TEST_F(AcceleratorControllerTest, WindowSnap) {
}
TEST_F(AcceleratorControllerTest, WindowSnapLeftDockLeftRestore) {
- scoped_ptr<aura::Window> window0(
+ std::unique_ptr<aura::Window> window0(
+ CreateTestWindowInShellWithBounds(gfx::Rect(5, 5, 20, 20)));
+ std::unique_ptr<aura::Window> window1(
CreateTestWindowInShellWithBounds(gfx::Rect(5, 5, 20, 20)));
- scoped_ptr<aura::Window> window1(
- CreateTestWindowInShellWithBounds(gfx::Rect(5, 5, 20, 20)));
wm::WindowState* window1_state = wm::GetWindowState(window1.get());
window1_state->Activate();
@@ -516,10 +516,10 @@ TEST_F(AcceleratorControllerTest, WindowSnapLeftDockLeftRestore) {
}
TEST_F(AcceleratorControllerTest, WindowSnapRightDockRightRestore) {
- scoped_ptr<aura::Window> window0(
+ std::unique_ptr<aura::Window> window0(
+ CreateTestWindowInShellWithBounds(gfx::Rect(5, 5, 20, 20)));
+ std::unique_ptr<aura::Window> window1(
CreateTestWindowInShellWithBounds(gfx::Rect(5, 5, 20, 20)));
- scoped_ptr<aura::Window> window1(
- CreateTestWindowInShellWithBounds(gfx::Rect(5, 5, 20, 20)));
wm::WindowState* window1_state = wm::GetWindowState(window1.get());
window1_state->Activate();
@@ -539,10 +539,10 @@ TEST_F(AcceleratorControllerTest, WindowSnapRightDockRightRestore) {
}
TEST_F(AcceleratorControllerTest, WindowSnapLeftDockLeftSnapRight) {
- scoped_ptr<aura::Window> window0(
+ std::unique_ptr<aura::Window> window0(
+ CreateTestWindowInShellWithBounds(gfx::Rect(5, 5, 20, 20)));
+ std::unique_ptr<aura::Window> window1(
CreateTestWindowInShellWithBounds(gfx::Rect(5, 5, 20, 20)));
- scoped_ptr<aura::Window> window1(
- CreateTestWindowInShellWithBounds(gfx::Rect(5, 5, 20, 20)));
wm::WindowState* window1_state = wm::GetWindowState(window1.get());
window1_state->Activate();
@@ -564,21 +564,21 @@ TEST_F(AcceleratorControllerTest, WindowSnapLeftDockLeftSnapRight) {
}
TEST_F(AcceleratorControllerTest, WindowDockLeftMinimizeWindowWithRestore) {
- scoped_ptr<aura::Window> window0(
+ std::unique_ptr<aura::Window> window0(
+ CreateTestWindowInShellWithBounds(gfx::Rect(5, 5, 20, 20)));
+ std::unique_ptr<aura::Window> window1(
CreateTestWindowInShellWithBounds(gfx::Rect(5, 5, 20, 20)));
- scoped_ptr<aura::Window> window1(
- CreateTestWindowInShellWithBounds(gfx::Rect(5, 5, 20, 20)));
wm::WindowState* window1_state = wm::GetWindowState(window1.get());
window1_state->Activate();
- scoped_ptr<aura::Window> window2(
- CreateTestWindowInShellWithBounds(gfx::Rect(5, 5, 20, 20)));
+ std::unique_ptr<aura::Window> window2(
+ CreateTestWindowInShellWithBounds(gfx::Rect(5, 5, 20, 20)));
wm::WindowState* window2_state = wm::GetWindowState(window2.get());
- scoped_ptr<aura::Window> window3(
- CreateTestWindowInShellWithBounds(gfx::Rect(5, 5, 20, 20)));
+ std::unique_ptr<aura::Window> window3(
+ CreateTestWindowInShellWithBounds(gfx::Rect(5, 5, 20, 20)));
wm::WindowState* window3_state = wm::GetWindowState(window3.get());
window3_state->Activate();
@@ -611,10 +611,10 @@ TEST_F(AcceleratorControllerTest, WindowDockLeftMinimizeWindowWithRestore) {
}
TEST_F(AcceleratorControllerTest, WindowPanelDockLeftDockRightRestore) {
- scoped_ptr<aura::Window> window0(
+ std::unique_ptr<aura::Window> window0(
CreateTestWindowInShellWithBounds(gfx::Rect(5, 5, 20, 20)));
- scoped_ptr<aura::Window> window(CreatePanel());
+ std::unique_ptr<aura::Window> window(CreatePanel());
wm::WindowState* window_state = wm::GetWindowState(window.get());
window_state->Activate();
@@ -639,7 +639,7 @@ TEST_F(AcceleratorControllerTest, WindowPanelDockLeftDockRightRestore) {
}
TEST_F(AcceleratorControllerTest, CenterWindowAccelerator) {
- scoped_ptr<aura::Window> window(
+ std::unique_ptr<aura::Window> window(
CreateTestWindowInShellWithBounds(gfx::Rect(5, 5, 20, 20)));
wm::WindowState* window_state = wm::GetWindowState(window.get());
window_state->Activate();
@@ -865,7 +865,7 @@ TEST_F(AcceleratorControllerTest, GlobalAccelerators) {
{
TestVolumeControlDelegate* delegate = new TestVolumeControlDelegate;
ash::Shell::GetInstance()->system_tray_delegate()->SetVolumeControlDelegate(
- scoped_ptr<VolumeControlDelegate>(delegate));
+ std::unique_ptr<VolumeControlDelegate>(delegate));
EXPECT_EQ(0, delegate->handle_volume_mute_count());
EXPECT_TRUE(ProcessInController(volume_mute));
EXPECT_EQ(1, delegate->handle_volume_mute_count());
@@ -887,7 +887,7 @@ TEST_F(AcceleratorControllerTest, GlobalAccelerators) {
DummyBrightnessControlDelegate* delegate =
new DummyBrightnessControlDelegate;
GetController()->SetBrightnessControlDelegate(
- scoped_ptr<BrightnessControlDelegate>(delegate));
+ std::unique_ptr<BrightnessControlDelegate>(delegate));
EXPECT_EQ(0, delegate->handle_brightness_down_count());
EXPECT_TRUE(ProcessInController(brightness_down));
EXPECT_EQ(1, delegate->handle_brightness_down_count());
@@ -909,7 +909,7 @@ TEST_F(AcceleratorControllerTest, GlobalAccelerators) {
DummyKeyboardBrightnessControlDelegate* delegate =
new DummyKeyboardBrightnessControlDelegate;
GetController()->SetKeyboardBrightnessControlDelegate(
- scoped_ptr<KeyboardBrightnessControlDelegate>(delegate));
+ std::unique_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());
@@ -1051,7 +1051,7 @@ TEST_F(AcceleratorControllerTest, ImeGlobalAccelerators) {
EXPECT_FALSE(ProcessInController(hangul));
DummyImeControlDelegate* delegate = new DummyImeControlDelegate;
GetController()->SetImeControlDelegate(
- scoped_ptr<ImeControlDelegate>(delegate));
+ std::unique_ptr<ImeControlDelegate>(delegate));
EXPECT_EQ(0, delegate->handle_previous_ime_count());
EXPECT_TRUE(ProcessInController(control_space_down));
EXPECT_EQ(1, delegate->handle_previous_ime_count());
@@ -1081,7 +1081,7 @@ TEST_F(AcceleratorControllerTest, ImeGlobalAccelerators) {
DummyImeControlDelegate* delegate = new DummyImeControlDelegate;
GetController()->SetImeControlDelegate(
- scoped_ptr<ImeControlDelegate>(delegate));
+ std::unique_ptr<ImeControlDelegate>(delegate));
EXPECT_EQ(0, delegate->handle_next_ime_count());
EXPECT_FALSE(ProcessInController(shift_alt_press));
EXPECT_TRUE(ProcessInController(shift_alt));
@@ -1143,7 +1143,7 @@ TEST_F(AcceleratorControllerTest, ImeGlobalAccelerators) {
DummyImeControlDelegate* delegate = new DummyImeControlDelegate;
GetController()->SetImeControlDelegate(
- scoped_ptr<ImeControlDelegate>(delegate));
+ std::unique_ptr<ImeControlDelegate>(delegate));
EXPECT_EQ(0, delegate->handle_next_ime_count());
EXPECT_FALSE(ProcessInController(shift_alt_press));
EXPECT_TRUE(ProcessInController(shift_alt));
@@ -1189,7 +1189,7 @@ TEST_F(AcceleratorControllerTest, ImeGlobalAcceleratorsWorkaround139556) {
TEST_F(AcceleratorControllerTest, ImeGlobalAcceleratorsNoConflict) {
DummyImeControlDelegate* delegate = new DummyImeControlDelegate;
GetController()->SetImeControlDelegate(
- scoped_ptr<ImeControlDelegate>(delegate));
+ std::unique_ptr<ImeControlDelegate>(delegate));
ui::test::EventGenerator& generator = GetEventGenerator();
// Correct sequence of a conflicting accelerator must not trigger next IME.
@@ -1359,7 +1359,7 @@ TEST_F(AcceleratorControllerTest, DisallowedAtModalWindow) {
<< " not found in kAcceleratorData or kDebugAcceleratorData. "
<< "action: " << *it;
}
- scoped_ptr<aura::Window> window(
+ std::unique_ptr<aura::Window> window(
CreateTestWindowInShellWithBounds(gfx::Rect(5, 5, 20, 20)));
wm::ActivateWindow(window.get());
Shell::GetInstance()->SimulateModalWindowOpenForTesting(true);
@@ -1405,7 +1405,7 @@ TEST_F(AcceleratorControllerTest, DisallowedAtModalWindow) {
DummyBrightnessControlDelegate* delegate =
new DummyBrightnessControlDelegate;
GetController()->SetBrightnessControlDelegate(
- scoped_ptr<BrightnessControlDelegate>(delegate));
+ std::unique_ptr<BrightnessControlDelegate>(delegate));
EXPECT_EQ(0, delegate->handle_brightness_down_count());
EXPECT_TRUE(ProcessInController(brightness_down));
EXPECT_EQ(1, delegate->handle_brightness_down_count());
@@ -1425,7 +1425,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));
+ std::unique_ptr<VolumeControlDelegate>(delegate));
EXPECT_EQ(0, delegate->handle_volume_mute_count());
EXPECT_TRUE(ProcessInController(volume_mute));
EXPECT_EQ(1, delegate->handle_volume_mute_count());
@@ -1455,7 +1455,7 @@ TEST_F(AcceleratorControllerTest, DisallowedWithNoWindow) {
}
// Make sure we don't alert if we do have a window.
- scoped_ptr<aura::Window> window;
+ std::unique_ptr<aura::Window> window;
for (size_t i = 0; i < kActionsNeedingWindowLength; ++i) {
window.reset(CreateTestWindowInShellWithBounds(gfx::Rect(5, 5, 20, 20)));
wm::ActivateWindow(window.get());
@@ -1492,7 +1492,7 @@ class DeprecatedAcceleratorTester : public AcceleratorControllerTest {
// For testing the deprecated and new IME shortcuts.
DummyImeControlDelegate* delegate = new DummyImeControlDelegate;
GetController()->SetImeControlDelegate(
- scoped_ptr<ImeControlDelegate>(delegate));
+ std::unique_ptr<ImeControlDelegate>(delegate));
}
ui::Accelerator CreateAccelerator(const AcceleratorData& data) const {
« ash/accelerators/accelerator_commands_unittest.cc ('K') | « ash/accelerators/accelerator_controller.cc ('k') | ash/accelerators/accelerator_filter_unittest.cc » ('j') | ash/ash_touch_exploration_manager_chromeos.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698