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

Side by Side Diff: chrome/test/data/webui/settings/quick_unlock_authenticate_browsertest_chromeos.js

Issue 2668623002: MD Settings: Fix remaining tests that fail in Vulcanized mode. (Closed)
Patch Set: Rebase Created 3 years, 10 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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 cr.define('settings_people_page_quick_unlock', function() { 5 cr.define('settings_people_page_quick_unlock', function() {
6 var element = null; 6 var element = null;
7 var quickUnlockPrivateApi = null; 7 var quickUnlockPrivateApi = null;
8 var QuickUnlockMode = chrome.quickUnlockPrivate.QuickUnlockMode; 8 var QuickUnlockMode = chrome.quickUnlockPrivate.QuickUnlockMode;
9 var fakeUma = null; 9 var fakeUma = null;
10 10
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
180 180
181 /** 181 /**
182 * Changes the lock screen pref value using the settings API; this is like 182 * Changes the lock screen pref value using the settings API; this is like
183 * the pref got changed from an unkown source such as another tab. 183 * the pref got changed from an unkown source such as another tab.
184 * @param {boolean} value 184 * @param {boolean} value
185 */ 185 */
186 function setLockScreenPref(value) { 186 function setLockScreenPref(value) {
187 fakeSettings.setPref(ENABLE_LOCK_SCREEN_PREF, value, '', assertTrue); 187 fakeSettings.setPref(ENABLE_LOCK_SCREEN_PREF, value, '', assertTrue);
188 } 188 }
189 189
190 suiteSetup(function() { 190 var USE_VULCANIZE = true;
191 var urls = [ 191 if (!USE_VULCANIZE) {
Dan Beam 2017/02/03 22:49:08 can you (for now) just check to see if some public
192 'chrome://md-settings/i18n_setup.html', 192 suiteSetup(function() {
193 'chrome://md-settings/prefs/prefs.html', 193 return PolymerTest.importHtml(
194 ]; 194 'chrome://md-settings/prefs/prefs.html');
195 return Promise.all(urls.map(PolymerTest.importHtml)); 195 });
196 }); 196 }
197 197
198 setup(function(done) { 198 setup(function(done) {
199 PolymerTest.clearBody(); 199 PolymerTest.clearBody();
200 200
201 CrSettingsPrefs.deferInitialization = true; 201 CrSettingsPrefs.deferInitialization = true;
202 202
203 // Build pref fakes. 203 // Build pref fakes.
204 var fakePrefs = [{ 204 var fakePrefs = [{
205 key: ENABLE_LOCK_SCREEN_PREF, 205 key: ENABLE_LOCK_SCREEN_PREF,
206 type: chrome.settingsPrivate.PrefType.BOOLEAN, 206 type: chrome.settingsPrivate.PrefType.BOOLEAN,
(...skipping 291 matching lines...) Expand 10 before | Expand all | Expand 10 after
498 }); 498 });
499 }); 499 });
500 } 500 }
501 501
502 return { 502 return {
503 registerAuthenticateTests: registerAuthenticateTests, 503 registerAuthenticateTests: registerAuthenticateTests,
504 registerLockScreenTests: registerLockScreenTests, 504 registerLockScreenTests: registerLockScreenTests,
505 registerSetupPinDialogTests: registerSetupPinDialogTests 505 registerSetupPinDialogTests: registerSetupPinDialogTests
506 }; 506 };
507 }); 507 });
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698