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

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

Issue 366813007: Removed InProcessBrowserTest::CleanUpOnMainThread() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Removed superfluous override. Created 6 years, 5 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 | Annotate | Revision Log
OLDNEW
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 <queue> 5 #include <queue>
6 6
7 #include "ash/shell.h" 7 #include "ash/shell.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/strings/string_util.h" 9 #include "base/strings/string_util.h"
10 #include "chrome/app/chrome_command_ids.h" 10 #include "chrome/app/chrome_command_ids.h"
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 43
44 class LoggedInSpokenFeedbackTest : public InProcessBrowserTest { 44 class LoggedInSpokenFeedbackTest : public InProcessBrowserTest {
45 protected: 45 protected:
46 LoggedInSpokenFeedbackTest() {} 46 LoggedInSpokenFeedbackTest() {}
47 virtual ~LoggedInSpokenFeedbackTest() {} 47 virtual ~LoggedInSpokenFeedbackTest() {}
48 48
49 virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { 49 virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
50 AccessibilityManager::SetBrailleControllerForTest(&braille_controller_); 50 AccessibilityManager::SetBrailleControllerForTest(&braille_controller_);
51 } 51 }
52 52
53 virtual void CleanUpOnMainThread() OVERRIDE { 53 virtual void TearDownOnMainThread() OVERRIDE {
54 AccessibilityManager::SetBrailleControllerForTest(NULL); 54 AccessibilityManager::SetBrailleControllerForTest(NULL);
55 } 55 }
56 56
57 void SendKeyPress(ui::KeyboardCode key) { 57 void SendKeyPress(ui::KeyboardCode key) {
58 gfx::NativeWindow root_window = 58 gfx::NativeWindow root_window =
59 ash::Shell::GetInstance()->GetPrimaryRootWindow(); 59 ash::Shell::GetInstance()->GetPrimaryRootWindow();
60 ASSERT_TRUE( 60 ASSERT_TRUE(
61 ui_test_utils::SendKeyPressToWindowSync( 61 ui_test_utils::SendKeyPressToWindowSync(
62 root_window, key, false, false, false, false)); 62 root_window, key, false, false, false, false));
63 } 63 }
(...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after
283 EXPECT_EQ("Select your language:", monitor.GetNextUtterance()); 283 EXPECT_EQ("Select your language:", monitor.GetNextUtterance());
284 EXPECT_EQ("English ( United States)", monitor.GetNextUtterance()); 284 EXPECT_EQ("English ( United States)", monitor.GetNextUtterance());
285 EXPECT_TRUE(MatchPattern(monitor.GetNextUtterance(), "Combo box * of *")); 285 EXPECT_TRUE(MatchPattern(monitor.GetNextUtterance(), "Combo box * of *"));
286 ASSERT_TRUE( 286 ASSERT_TRUE(
287 ui_test_utils::SendKeyPressToWindowSync( 287 ui_test_utils::SendKeyPressToWindowSync(
288 window, ui::VKEY_TAB, false, false, false, false)); 288 window, ui::VKEY_TAB, false, false, false, false));
289 EXPECT_EQ("Select your keyboard:", monitor.GetNextUtterance()); 289 EXPECT_EQ("Select your keyboard:", monitor.GetNextUtterance());
290 } 290 }
291 291
292 } // namespace chromeos 292 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698