ash/accelerators/spoken_feedback_toggler_unittest.cc - Issue 1867223004: Convert //ash from scoped_ptr to std::unique_ptr

Side by Side Diff: ash/accelerators/spoken_feedback_toggler_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 unified diff | Download patch

« ash/accelerators/accelerator_commands_unittest.cc ('K') | « ash/accelerators/spoken_feedback_toggler.cc ('k') | ash/ash_touch_exploration_manager_chromeos.h » ('j') | ash/ash_touch_exploration_manager_chromeos.h » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright 2014 The Chromium Authors. All rights reserved.	1 // Copyright 2014 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "ash/accelerators/spoken_feedback_toggler.h"	5 #include "ash/accelerators/spoken_feedback_toggler.h"

6 #include "ash/accessibility_delegate.h"	6 #include "ash/accessibility_delegate.h"

7 #include "ash/shell.h"	7 #include "ash/shell.h"

8 #include "ash/test/ash_test_base.h"	8 #include "ash/test/ash_test_base.h"

9 #include "ash/wm/window_util.h"	9 #include "ash/wm/window_util.h"

10 #include "ui/aura/test/test_window_delegate.h"	10 #include "ui/aura/test/test_window_delegate.h"

(...skipping 33 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
44 generator.PressKey(ui::VKEY_F6, ui::EF_SHIFT_DOWN);	44 generator.PressKey(ui::VKEY_F6, ui::EF_SHIFT_DOWN);

45 EXPECT_FALSE(delegate->IsSpokenFeedbackEnabled());	45 EXPECT_FALSE(delegate->IsSpokenFeedbackEnabled());

46 generator.ReleaseKey(ui::VKEY_F6, 0);	46 generator.ReleaseKey(ui::VKEY_F6, 0);

47 EXPECT_FALSE(delegate->IsSpokenFeedbackEnabled());	47 EXPECT_FALSE(delegate->IsSpokenFeedbackEnabled());

48 }	48 }

49	49

50 TEST_F(SpokenFeedbackTogglerTest, PassThroughEvents) {	50 TEST_F(SpokenFeedbackTogglerTest, PassThroughEvents) {

51 SpokenFeedbackToggler::ScopedEnablerForTest scoped;	51 SpokenFeedbackToggler::ScopedEnablerForTest scoped;

52	52

53 aura::test::EventCountDelegate delegate;	53 aura::test::EventCountDelegate delegate;

54 scoped_ptr<aura::Window> window(CreateTestWindowInShellWithDelegate(	54 std::unique_ptr<aura::Window> window(CreateTestWindowInShellWithDelegate(

55 &delegate, 0, gfx::Rect(0, 0, 100, 100)));	55 &delegate, 0, gfx::Rect(0, 0, 100, 100)));

56 window->Focus();	56 window->Focus();

57	57

58 ui::test::EventGenerator& generator = GetEventGenerator();	58 ui::test::EventGenerator& generator = GetEventGenerator();

59	59

60 // None hotkey events.	60 // None hotkey events.

61 generator.PressKey(ui::VKEY_A, 0);	61 generator.PressKey(ui::VKEY_A, 0);

62 generator.ReleaseKey(ui::VKEY_F6, 0);	62 generator.ReleaseKey(ui::VKEY_F6, 0);

63 EXPECT_EQ("1 1", delegate.GetKeyCountsAndReset());	63 EXPECT_EQ("1 1", delegate.GetKeyCountsAndReset());

64	64

65 // Single hotkey press and release.	65 // Single hotkey press and release.

66 generator.PressKey(ui::VKEY_F6, ui::EF_SHIFT_DOWN);	66 generator.PressKey(ui::VKEY_F6, ui::EF_SHIFT_DOWN);

67 generator.ReleaseKey(ui::VKEY_F6, 0);	67 generator.ReleaseKey(ui::VKEY_F6, 0);

68 EXPECT_EQ("1 1", delegate.GetKeyCountsAndReset());	68 EXPECT_EQ("1 1", delegate.GetKeyCountsAndReset());

69	69

70 // Hotkey press and hold.	70 // Hotkey press and hold.

71 generator.PressKey(ui::VKEY_F6, ui::EF_SHIFT_DOWN);	71 generator.PressKey(ui::VKEY_F6, ui::EF_SHIFT_DOWN);

72 generator.PressKey(ui::VKEY_F6, ui::EF_SHIFT_DOWN);	72 generator.PressKey(ui::VKEY_F6, ui::EF_SHIFT_DOWN);

73 generator.PressKey(ui::VKEY_F6, ui::EF_SHIFT_DOWN);	73 generator.PressKey(ui::VKEY_F6, ui::EF_SHIFT_DOWN);

74 generator.ReleaseKey(ui::VKEY_F6, 0);	74 generator.ReleaseKey(ui::VKEY_F6, 0);

75 EXPECT_EQ("3 1", delegate.GetKeyCountsAndReset());	75 EXPECT_EQ("3 1", delegate.GetKeyCountsAndReset());

76 }	76 }

77	77

78 } // namespace ash	78 } // namespace ash

OLD	NEW