| Index: chrome/test/data/webui/md_user_manager/user_manager_browsertest.js
|
| diff --git a/chrome/test/data/webui/md_user_manager/user_manager_browsertest.js b/chrome/test/data/webui/md_user_manager/user_manager_browsertest.js
|
| index 2ffff2cd6041e00c2e5f1cb0c06a0e62b93bbcb3..e204d7c4bd6a6614e74f04ea2b54c951bb0e09d2 100644
|
| --- a/chrome/test/data/webui/md_user_manager/user_manager_browsertest.js
|
| +++ b/chrome/test/data/webui/md_user_manager/user_manager_browsertest.js
|
| @@ -37,7 +37,12 @@ UserManagerBrowserTest.prototype = {
|
| runAccessibilityChecks: false,
|
| };
|
|
|
| -TEST_F('UserManagerBrowserTest', 'UserManagerTest', function() {
|
| +GEN('#if defined(OS_WIN)');
|
| +GEN('#define MAYBE_UserManagerTest DISABLED_UserManagerTest');
|
| +GEN('#else');
|
| +GEN('#define MAYBE_UserManagerTest UserManagerTest');
|
| +GEN('#endif');
|
| +TEST_F('UserManagerBrowserTest', 'MAYBE_UserManagerTest', function() {
|
| user_manager.control_bar_tests.registerTests();
|
| user_manager.create_profile_tests.registerTests();
|
| user_manager.import_supervised_user_tests.registerTests();
|
|
|