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

Side by Side Diff: chrome/browser/chromeos/system/tray_accessibility_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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/magnifier/magnification_controller.h" 5 #include "ash/magnifier/magnification_controller.h"
6 #include "ash/shell.h" 6 #include "ash/shell.h"
7 #include "ash/system/tray/system_tray.h" 7 #include "ash/system/tray/system_tray.h"
8 #include "ash/system/tray_accessibility.h" 8 #include "ash/system/tray_accessibility.h"
9 #include "ash/system/user/login_status.h" 9 #include "ash/system/user/login_status.h"
10 #include "base/callback.h" 10 #include "base/callback.h"
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 AccessibilityManager::Get()->SetProfileForTest(GetProfile()); 84 AccessibilityManager::Get()->SetProfileForTest(GetProfile());
85 MagnificationManager::Get()->SetProfileForTest(GetProfile()); 85 MagnificationManager::Get()->SetProfileForTest(GetProfile());
86 } 86 }
87 87
88 virtual void RunTestOnMainThreadLoop() OVERRIDE { 88 virtual void RunTestOnMainThreadLoop() OVERRIDE {
89 // Need to mark oobe completed to show detailed views. 89 // Need to mark oobe completed to show detailed views.
90 StartupUtils::MarkOobeCompleted(); 90 StartupUtils::MarkOobeCompleted();
91 InProcessBrowserTest::RunTestOnMainThreadLoop(); 91 InProcessBrowserTest::RunTestOnMainThreadLoop();
92 } 92 }
93 93
94 virtual void CleanUpOnMainThread() OVERRIDE { 94 virtual void TearDownOnMainThread() OVERRIDE {
95 AccessibilityManager::SetBrailleControllerForTest(NULL); 95 AccessibilityManager::SetBrailleControllerForTest(NULL);
96 } 96 }
97 97
98 void SetShowAccessibilityOptionsInSystemTrayMenu(bool value) { 98 void SetShowAccessibilityOptionsInSystemTrayMenu(bool value) {
99 if (GetParam() == PREF_SERVICE) { 99 if (GetParam() == PREF_SERVICE) {
100 PrefService* prefs = GetProfile()->GetPrefs(); 100 PrefService* prefs = GetProfile()->GetPrefs();
101 prefs->SetBoolean(prefs::kShouldAlwaysShowAccessibilityMenu, value); 101 prefs->SetBoolean(prefs::kShouldAlwaysShowAccessibilityMenu, value);
102 } else if (GetParam() == POLICY) { 102 } else if (GetParam() == POLICY) {
103 policy::PolicyMap policy_map; 103 policy::PolicyMap policy_map;
104 policy_map.Set(policy::key::kShowAccessibilityOptionsInSystemTrayMenu, 104 policy_map.Set(policy::key::kShowAccessibilityOptionsInSystemTrayMenu,
(...skipping 768 matching lines...) Expand 10 before | Expand all | Expand 10 after
873 EXPECT_TRUE(IsVirtualKeyboardMenuShownOnDetailMenu()); 873 EXPECT_TRUE(IsVirtualKeyboardMenuShownOnDetailMenu());
874 CloseDetailMenu(); 874 CloseDetailMenu();
875 } 875 }
876 876
877 INSTANTIATE_TEST_CASE_P(TrayAccessibilityTestInstance, 877 INSTANTIATE_TEST_CASE_P(TrayAccessibilityTestInstance,
878 TrayAccessibilityTest, 878 TrayAccessibilityTest,
879 testing::Values(PREF_SERVICE, 879 testing::Values(PREF_SERVICE,
880 POLICY)); 880 POLICY));
881 881
882 } // namespace chromeos 882 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698