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

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

Issue 2313103002: Added uma for pin unlock set up. (Closed)
Patch Set: Closure compiler fix. Created 4 years 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 /** @fileoverview Runs the Polymer Settings tests. */ 5 /** @fileoverview Runs the Polymer Settings tests. */
6 6
7 /** @const {string} Path to source root. */ 7 /** @const {string} Path to source root. */
8 var ROOT_PATH = '../../../../../'; 8 var ROOT_PATH = '../../../../../';
9 9
10 // Polymer BrowserTest fixture. 10 // Polymer BrowserTest fixture.
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after
190 CrSettingsPeoplePageQuickUnlockAuthenticateTest.prototype = { 190 CrSettingsPeoplePageQuickUnlockAuthenticateTest.prototype = {
191 __proto__: CrSettingsBrowserTest.prototype, 191 __proto__: CrSettingsBrowserTest.prototype,
192 192
193 /** @override */ 193 /** @override */
194 browsePreload: 'chrome://md-settings/people_page/password_prompt_dialog.html', 194 browsePreload: 'chrome://md-settings/people_page/password_prompt_dialog.html',
195 195
196 /** @override */ 196 /** @override */
197 extraLibraries: CrSettingsBrowserTest.prototype.extraLibraries.concat([ 197 extraLibraries: CrSettingsBrowserTest.prototype.extraLibraries.concat([
198 '../fake_chrome_event.js', 198 '../fake_chrome_event.js',
199 'fake_quick_unlock_private.js', 199 'fake_quick_unlock_private.js',
200 'fake_quick_unlock_uma.js',
200 'quick_unlock_authenticate_browsertest_chromeos.js' 201 'quick_unlock_authenticate_browsertest_chromeos.js'
201 ]), 202 ]),
202 }; 203 };
203 204
204 TEST_F('CrSettingsPeoplePageQuickUnlockAuthenticateTest', 'Test', function() { 205 TEST_F('CrSettingsPeoplePageQuickUnlockAuthenticateTest', 'Test', function() {
205 settings_people_page_quick_unlock.registerAuthenticateTests(); 206 settings_people_page_quick_unlock.registerAuthenticateTests();
206 mocha.run(); 207 mocha.run();
207 }); 208 });
208 209
209 /** 210 /**
(...skipping 10 matching lines...) Expand all
220 221
221 /** @override */ 222 /** @override */
222 //browsePreload: 'chrome://md-settings/settings_main/settings_main.html', 223 //browsePreload: 'chrome://md-settings/settings_main/settings_main.html',
223 browsePreload: 'chrome://md-settings/people_page/lock_screen.html', 224 browsePreload: 'chrome://md-settings/people_page/lock_screen.html',
224 225
225 /** @override */ 226 /** @override */
226 extraLibraries: CrSettingsBrowserTest.prototype.extraLibraries.concat([ 227 extraLibraries: CrSettingsBrowserTest.prototype.extraLibraries.concat([
227 '../fake_chrome_event.js', 228 '../fake_chrome_event.js',
228 'fake_quick_unlock_private.js', 229 'fake_quick_unlock_private.js',
229 'fake_settings_private.js', 230 'fake_settings_private.js',
231 'fake_quick_unlock_uma.js',
230 'quick_unlock_authenticate_browsertest_chromeos.js' 232 'quick_unlock_authenticate_browsertest_chromeos.js'
231 ]), 233 ]),
232 }; 234 };
233 235
234 TEST_F('CrSettingsPeoplePageLockScreenTest', 'Test', function() { 236 TEST_F('CrSettingsPeoplePageLockScreenTest', 'Test', function() {
235 settings_people_page_quick_unlock.registerLockScreenTests(); 237 settings_people_page_quick_unlock.registerLockScreenTests();
236 mocha.run(); 238 mocha.run();
237 }); 239 });
238 240
239 /** 241 /**
(...skipping 10 matching lines...) Expand all
250 __proto__: CrSettingsBrowserTest.prototype, 252 __proto__: CrSettingsBrowserTest.prototype,
251 253
252 /** @override */ 254 /** @override */
253 browsePreload: 'chrome://md-settings/people_page/setup_pin_dialog.html', 255 browsePreload: 'chrome://md-settings/people_page/setup_pin_dialog.html',
254 256
255 /** @override */ 257 /** @override */
256 extraLibraries: CrSettingsBrowserTest.prototype.extraLibraries.concat([ 258 extraLibraries: CrSettingsBrowserTest.prototype.extraLibraries.concat([
257 '../fake_chrome_event.js', 259 '../fake_chrome_event.js',
258 'fake_quick_unlock_private.js', 260 'fake_quick_unlock_private.js',
259 'fake_settings_private.js', 261 'fake_settings_private.js',
262 'fake_quick_unlock_uma.js',
260 'quick_unlock_authenticate_browsertest_chromeos.js' 263 'quick_unlock_authenticate_browsertest_chromeos.js'
261 ]), 264 ]),
262 }; 265 };
263 266
264 TEST_F('CrSettingsPeoplePageSetupPinDialogTest', 'Test', function() { 267 TEST_F('CrSettingsPeoplePageSetupPinDialogTest', 'Test', function() {
265 settings_people_page_quick_unlock.registerSetupPinDialogTests(); 268 settings_people_page_quick_unlock.registerSetupPinDialogTests();
266 mocha.run(); 269 mocha.run();
267 }); 270 });
268 271
269 /** 272 /**
(...skipping 889 matching lines...) Expand 10 before | Expand all | Expand 10 after
1159 extraLibraries: CrSettingsBrowserTest.prototype.extraLibraries.concat([ 1162 extraLibraries: CrSettingsBrowserTest.prototype.extraLibraries.concat([
1160 'test_browser_proxy.js', 1163 'test_browser_proxy.js',
1161 'test_extension_control_browser_proxy.js', 1164 'test_extension_control_browser_proxy.js',
1162 'extension_controlled_indicator_tests.js', 1165 'extension_controlled_indicator_tests.js',
1163 ]), 1166 ]),
1164 }; 1167 };
1165 1168
1166 TEST_F('CrSettingsExtensionControlledIndicatorTest', 'All', function() { 1169 TEST_F('CrSettingsExtensionControlledIndicatorTest', 'All', function() {
1167 mocha.run(); 1170 mocha.run();
1168 }); 1171 });
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/settings/md_settings_ui.cc ('k') | chrome/test/data/webui/settings/fake_quick_unlock_uma.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698