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

Side by Side Diff: chrome/browser/chromeos/accessibility/accessibility_manager_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 (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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/accessibility_manager.h" 5 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
6 6
7 #include "ash/magnifier/magnification_controller.h" 7 #include "ash/magnifier/magnification_controller.h"
8 #include "ash/shell.h" 8 #include "ash/shell.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/prefs/pref_service.h" 10 #include "base/prefs/pref_service.h"
(...skipping 224 matching lines...) Expand 10 before | Expand all | Expand 10 after
235 AccessibilityManager::SetBrailleControllerForTest(&braille_controller_); 235 AccessibilityManager::SetBrailleControllerForTest(&braille_controller_);
236 } 236 }
237 237
238 virtual void SetUpOnMainThread() OVERRIDE { 238 virtual void SetUpOnMainThread() OVERRIDE {
239 // Sets the login-screen profile. 239 // Sets the login-screen profile.
240 AccessibilityManager::Get()-> 240 AccessibilityManager::Get()->
241 SetProfileForTest(ProfileHelper::GetSigninProfile()); 241 SetProfileForTest(ProfileHelper::GetSigninProfile());
242 default_autoclick_delay_ = GetAutoclickDelay(); 242 default_autoclick_delay_ = GetAutoclickDelay();
243 } 243 }
244 244
245 virtual void CleanUpOnMainThread() OVERRIDE { 245 virtual void TearDownOnMainThread() OVERRIDE {
246 AccessibilityManager::SetBrailleControllerForTest(NULL); 246 AccessibilityManager::SetBrailleControllerForTest(NULL);
247 } 247 }
248 248
249 void SetBrailleDisplayAvailability(bool available) { 249 void SetBrailleDisplayAvailability(bool available) {
250 braille_controller_.SetAvailable(available); 250 braille_controller_.SetAvailable(available);
251 braille_controller_.GetObserver()->OnBrailleDisplayStateChanged( 251 braille_controller_.GetObserver()->OnBrailleDisplayStateChanged(
252 *braille_controller_.GetDisplayState()); 252 *braille_controller_.GetDisplayState());
253 } 253 }
254 254
255 int default_autoclick_delay() const { return default_autoclick_delay_; } 255 int default_autoclick_delay() const { return default_autoclick_delay_; }
(...skipping 446 matching lines...) Expand 10 before | Expand all | Expand 10 after
702 EXPECT_FALSE(ShouldShowAccessibilityMenu()); 702 EXPECT_FALSE(ShouldShowAccessibilityMenu());
703 703
704 // Check on-screen keyboard. 704 // Check on-screen keyboard.
705 SetVirtualKeyboardEnabled(true); 705 SetVirtualKeyboardEnabled(true);
706 EXPECT_TRUE(ShouldShowAccessibilityMenu()); 706 EXPECT_TRUE(ShouldShowAccessibilityMenu());
707 SetVirtualKeyboardEnabled(false); 707 SetVirtualKeyboardEnabled(false);
708 EXPECT_FALSE(ShouldShowAccessibilityMenu()); 708 EXPECT_FALSE(ShouldShowAccessibilityMenu());
709 } 709 }
710 710
711 } // namespace chromeos 711 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698