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

Side by Side Diff: chrome/browser/chromeos/preferences_browsertest.cc

Issue 655783002: Attempt to fix flaky ChromeOS test timeouts. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 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 <sys/types.h> 5 #include <sys/types.h>
6 6
7 #include "ash/shell.h" 7 #include "ash/shell.h"
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "base/prefs/pref_service.h" 10 #include "base/prefs/pref_service.h"
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 133
134 DISALLOW_COPY_AND_ASSIGN(PreferencesTest); 134 DISALLOW_COPY_AND_ASSIGN(PreferencesTest);
135 }; 135 };
136 136
137 IN_PROC_BROWSER_TEST_F(PreferencesTest, PRE_MultiProfiles) { 137 IN_PROC_BROWSER_TEST_F(PreferencesTest, PRE_MultiProfiles) {
138 RegisterUser(kTestUsers[0]); 138 RegisterUser(kTestUsers[0]);
139 RegisterUser(kTestUsers[1]); 139 RegisterUser(kTestUsers[1]);
140 chromeos::StartupUtils::MarkOobeCompleted(); 140 chromeos::StartupUtils::MarkOobeCompleted();
141 } 141 }
142 142
143 // Disabled for flaky timeouts. https://crbug.com/423077 143 IN_PROC_BROWSER_TEST_F(PreferencesTest, MultiProfiles) {
144 IN_PROC_BROWSER_TEST_F(PreferencesTest, DISABLED_MultiProfiles) {
145 user_manager::UserManager* user_manager = user_manager::UserManager::Get(); 144 user_manager::UserManager* user_manager = user_manager::UserManager::Get();
146 145
147 // Add first user and init its preferences. Check that corresponding 146 // Add first user and init its preferences. Check that corresponding
148 // settings has been changed. 147 // settings has been changed.
149 LoginUser(kTestUsers[0]); 148 LoginUser(kTestUsers[0]);
150 const user_manager::User* user1 = user_manager->FindUser(kTestUsers[0]); 149 const user_manager::User* user1 = user_manager->FindUser(kTestUsers[0]);
151 PrefService* prefs1 = 150 PrefService* prefs1 =
152 ProfileHelper::Get()->GetProfileByUserUnsafe(user1)->GetPrefs(); 151 ProfileHelper::Get()->GetProfileByUserUnsafe(user1)->GetPrefs();
153 SetPrefs(prefs1, false); 152 SetPrefs(prefs1, false);
154 content::RunAllPendingInMessageLoop(); 153 content::RunAllPendingInMessageLoop();
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
202 !prefs1->GetBoolean(prefs::kTapToClickEnabled)); 201 !prefs1->GetBoolean(prefs::kTapToClickEnabled));
203 CheckLocalStateCorrespondsToPrefs(prefs1); 202 CheckLocalStateCorrespondsToPrefs(prefs1);
204 203
205 // Switch user back. 204 // Switch user back.
206 user_manager->SwitchActiveUser(kTestUsers[0]); 205 user_manager->SwitchActiveUser(kTestUsers[0]);
207 CheckSettingsCorrespondToPrefs(prefs1); 206 CheckSettingsCorrespondToPrefs(prefs1);
208 CheckLocalStateCorrespondsToPrefs(prefs1); 207 CheckLocalStateCorrespondsToPrefs(prefs1);
209 } 208 }
210 209
211 } // namespace chromeos 210 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698