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

Side by Side Diff: chrome/browser/chromeos/accessibility/spoken_feedback_event_rewriter_unittest.cc

Issue 1870793002: Convert //chrome/browser/chromeos from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase 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
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "chrome/browser/chromeos/accessibility/spoken_feedback_event_rewriter.h " 5 #include "chrome/browser/chromeos/accessibility/spoken_feedback_event_rewriter.h "
6 6
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 "base/macros.h" 9 #include "base/macros.h"
10 #include "ui/aura/window.h" 10 #include "ui/aura/window.h"
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 DISALLOW_COPY_AND_ASSIGN(TestDelegate); 65 DISALLOW_COPY_AND_ASSIGN(TestDelegate);
66 }; 66 };
67 67
68 class SpokenFeedbackEventRewriterTest : public ash::test::AshTestBase { 68 class SpokenFeedbackEventRewriterTest : public ash::test::AshTestBase {
69 public: 69 public:
70 SpokenFeedbackEventRewriterTest() 70 SpokenFeedbackEventRewriterTest()
71 : generator_(nullptr), 71 : generator_(nullptr),
72 spoken_feedback_event_rewriter_(new SpokenFeedbackEventRewriter()) { 72 spoken_feedback_event_rewriter_(new SpokenFeedbackEventRewriter()) {
73 delegate_ = new TestDelegate(); 73 delegate_ = new TestDelegate();
74 spoken_feedback_event_rewriter_->SetDelegateForTest( 74 spoken_feedback_event_rewriter_->SetDelegateForTest(
75 scoped_ptr<TestDelegate>(delegate_)); 75 std::unique_ptr<TestDelegate>(delegate_));
76 } 76 }
77 77
78 void SetUp() override { 78 void SetUp() override {
79 ash::test::AshTestBase::SetUp(); 79 ash::test::AshTestBase::SetUp();
80 generator_ = &AshTestBase::GetEventGenerator(); 80 generator_ = &AshTestBase::GetEventGenerator();
81 CurrentContext()->AddPreTargetHandler(&event_capturer_); 81 CurrentContext()->AddPreTargetHandler(&event_capturer_);
82 CurrentContext()->GetHost()->GetEventSource()->AddEventRewriter( 82 CurrentContext()->GetHost()->GetEventSource()->AddEventRewriter(
83 spoken_feedback_event_rewriter_.get()); 83 spoken_feedback_event_rewriter_.get());
84 } 84 }
85 85
86 void TearDown() override { 86 void TearDown() override {
87 CurrentContext()->GetHost()->GetEventSource()->RemoveEventRewriter( 87 CurrentContext()->GetHost()->GetEventSource()->RemoveEventRewriter(
88 spoken_feedback_event_rewriter_.get()); 88 spoken_feedback_event_rewriter_.get());
89 CurrentContext()->RemovePreTargetHandler(&event_capturer_); 89 CurrentContext()->RemovePreTargetHandler(&event_capturer_);
90 generator_ = nullptr; 90 generator_ = nullptr;
91 ash::test::AshTestBase::TearDown(); 91 ash::test::AshTestBase::TearDown();
92 } 92 }
93 93
94 protected: 94 protected:
95 TestDelegate* delegate_; 95 TestDelegate* delegate_;
96 ui::test::EventGenerator* generator_; 96 ui::test::EventGenerator* generator_;
97 EventCapturer event_capturer_; 97 EventCapturer event_capturer_;
98 98
99 private: 99 private:
100 scoped_ptr<SpokenFeedbackEventRewriter> spoken_feedback_event_rewriter_; 100 std::unique_ptr<SpokenFeedbackEventRewriter> spoken_feedback_event_rewriter_;
101 101
102 DISALLOW_COPY_AND_ASSIGN(SpokenFeedbackEventRewriterTest); 102 DISALLOW_COPY_AND_ASSIGN(SpokenFeedbackEventRewriterTest);
103 }; 103 };
104 104
105 TEST_F(SpokenFeedbackEventRewriterTest, KeysNotEatenWithChromeVoxDisabled) { 105 TEST_F(SpokenFeedbackEventRewriterTest, KeysNotEatenWithChromeVoxDisabled) {
106 // Send Search+Shift+Right. 106 // Send Search+Shift+Right.
107 generator_->PressKey(ui::VKEY_LWIN, ui::EF_COMMAND_DOWN); 107 generator_->PressKey(ui::VKEY_LWIN, ui::EF_COMMAND_DOWN);
108 ASSERT_EQ(1U, event_capturer_.captured_events().size()); 108 ASSERT_EQ(1U, event_capturer_.captured_events().size());
109 generator_->PressKey(ui::VKEY_SHIFT, ui::EF_COMMAND_DOWN | ui::EF_SHIFT_DOWN); 109 generator_->PressKey(ui::VKEY_SHIFT, ui::EF_COMMAND_DOWN | ui::EF_SHIFT_DOWN);
110 ASSERT_EQ(2U, event_capturer_.captured_events().size()); 110 ASSERT_EQ(2U, event_capturer_.captured_events().size());
(...skipping 10 matching lines...) Expand all
121 generator_->ReleaseKey(ui::VKEY_SHIFT, ui::EF_COMMAND_DOWN); 121 generator_->ReleaseKey(ui::VKEY_SHIFT, ui::EF_COMMAND_DOWN);
122 generator_->ReleaseKey(ui::VKEY_LWIN, 0); 122 generator_->ReleaseKey(ui::VKEY_LWIN, 0);
123 ASSERT_EQ(6U, event_capturer_.captured_events().size()); 123 ASSERT_EQ(6U, event_capturer_.captured_events().size());
124 124
125 // Try releasing more keys. 125 // Try releasing more keys.
126 generator_->ReleaseKey(ui::VKEY_RIGHT, 0); 126 generator_->ReleaseKey(ui::VKEY_RIGHT, 0);
127 generator_->ReleaseKey(ui::VKEY_SHIFT, 0); 127 generator_->ReleaseKey(ui::VKEY_SHIFT, 0);
128 generator_->ReleaseKey(ui::VKEY_LWIN, 0); 128 generator_->ReleaseKey(ui::VKEY_LWIN, 0);
129 ASSERT_EQ(9U, event_capturer_.captured_events().size()); 129 ASSERT_EQ(9U, event_capturer_.captured_events().size());
130 } 130 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698