Index: chrome/chrome_tests.gypi |
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi |
index 74265799fa0f3a488eb107e76ec2bc548bff726e..0822e9bf7b1d38bb6363a6c5648c6fbdcc4a9ff6 100644 |
--- a/chrome/chrome_tests.gypi |
+++ b/chrome/chrome_tests.gypi |
@@ -280,17 +280,17 @@ |
'browser/chromeos/input_method/textinput_test_helper.cc', |
'browser/chromeos/input_method/textinput_test_helper.h', |
'browser/chromeos/login/eula_browsertest.cc', |
+ 'browser/chromeos/login/lock/screen_locker_browsertest.cc', |
+ 'browser/chromeos/login/lock/screen_locker_tester.cc', |
+ 'browser/chromeos/login/lock/screen_locker_tester.h', |
'browser/chromeos/login/login_browsertest.cc', |
'browser/chromeos/login/login_manager_test.cc', |
'browser/chromeos/login/login_manager_test.h', |
'browser/chromeos/login/login_ui_browsertest.cc', |
'browser/chromeos/login/oobe_browsertest.cc', |
- 'browser/chromeos/login/screen_locker_browsertest.cc', |
- 'browser/chromeos/login/screen_locker_tester.cc', |
- 'browser/chromeos/login/screen_locker_tester.h', |
- 'browser/chromeos/login/wallpaper_manager_browsertest.cc', |
- 'browser/chromeos/login/wallpaper_manager_test_utils.cc', |
- 'browser/chromeos/login/wallpaper_manager_test_utils.h', |
+ 'browser/chromeos/login/users/wallpaper/wallpaper_manager_browsertest.cc', |
+ 'browser/chromeos/login/users/wallpaper/wallpaper_manager_test_utils.cc', |
+ 'browser/chromeos/login/users/wallpaper/wallpaper_manager_test_utils.h', |
'test/data/chromeos/service_login.html', |
], |
'sources!': [ |
@@ -915,7 +915,8 @@ |
'browser/chromeos/input_method/mode_indicator_browsertest.cc', |
'browser/chromeos/kiosk_mode/mock_kiosk_mode_settings.cc', |
'browser/chromeos/kiosk_mode/mock_kiosk_mode_settings.h', |
- 'browser/chromeos/login/captive_portal_window_browsertest.cc', |
+ 'browser/chromeos/login/auth/mock_authenticator.cc', |
+ 'browser/chromeos/login/auth/mock_authenticator.h', |
'browser/chromeos/login/crash_restore_browsertest.cc', |
'browser/chromeos/login/demo_mode/demo_app_launcher_browsertest.cc', |
'browser/chromeos/login/enrollment/enrollment_screen_browsertest.cc', |
@@ -923,6 +924,8 @@ |
'browser/chromeos/login/enrollment/mock_enrollment_screen.h', |
'browser/chromeos/login/existing_user_controller_browsertest.cc', |
'browser/chromeos/login/kiosk_browsertest.cc', |
+ 'browser/chromeos/login/lock/screen_locker_tester.cc', |
+ 'browser/chromeos/login/lock/screen_locker_tester.h', |
'browser/chromeos/login/login_screen_policy_browsertest.cc', |
'browser/chromeos/login/login_utils_browsertest.cc', |
'browser/chromeos/login/login_manager_test.cc', |
@@ -931,17 +934,10 @@ |
'browser/chromeos/login/managed/managed_user_password_browsertest.cc', |
'browser/chromeos/login/managed/managed_user_test_base.cc', |
'browser/chromeos/login/managed/managed_user_test_base.h', |
- 'browser/chromeos/login/mock_authenticator.cc', |
- 'browser/chromeos/login/mock_authenticator.h', |
- 'browser/chromeos/login/oauth2_browsertest.cc', |
- 'browser/chromeos/login/oobe_base_test.cc', |
- 'browser/chromeos/login/oobe_base_test.h', |
'browser/chromeos/login/oobe_localization_browsertest.cc', |
'browser/chromeos/login/reset_browsertest.cc', |
'browser/chromeos/login/saml/saml_browsertest.cc', |
'browser/chromeos/login/session_login_browsertest.cc', |
- 'browser/chromeos/login/screen_locker_tester.cc', |
- 'browser/chromeos/login/screen_locker_tester.h', |
'browser/chromeos/login/screens/mock_error_screen.cc', |
'browser/chromeos/login/screens/mock_error_screen.h', |
'browser/chromeos/login/screens/mock_eula_screen.cc', |
@@ -954,23 +950,27 @@ |
'browser/chromeos/login/screens/mock_update_screen.h', |
'browser/chromeos/login/screens/network_screen_browsertest.cc', |
'browser/chromeos/login/screens/update_screen_browsertest.cc', |
- 'browser/chromeos/login/simple_web_view_dialog_browsertest.cc', |
+ 'browser/chromeos/login/signin/oauth2_browsertest.cc', |
'browser/chromeos/login/test/app_window_waiter.cc', |
'browser/chromeos/login/test/app_window_waiter.h', |
'browser/chromeos/login/test/https_forwarder.cc', |
'browser/chromeos/login/test/https_forwarder.h', |
+ 'browser/chromeos/login/test/oobe_base_test.cc', |
+ 'browser/chromeos/login/test/oobe_base_test.h', |
+ 'browser/chromeos/login/test/wizard_in_process_browser_test.cc', |
+ 'browser/chromeos/login/test/wizard_in_process_browser_test.h', |
'browser/chromeos/login/test_login_utils.cc', |
'browser/chromeos/login/test_login_utils.h', |
- 'browser/chromeos/login/user_adding_screen_browsertest.cc', |
- 'browser/chromeos/login/user_image_manager_browsertest.cc', |
- 'browser/chromeos/login/user_image_manager_test_util.cc', |
- 'browser/chromeos/login/user_image_manager_test_util.h', |
- 'browser/chromeos/login/wallpaper_manager_policy_browsertest.cc', |
- 'browser/chromeos/login/wallpaper_manager_test_utils.cc', |
- 'browser/chromeos/login/wallpaper_manager_test_utils.h', |
+ 'browser/chromeos/login/ui/captive_portal_window_browsertest.cc', |
+ 'browser/chromeos/login/ui/simple_web_view_dialog_browsertest.cc', |
+ 'browser/chromeos/login/ui/user_adding_screen_browsertest.cc', |
+ 'browser/chromeos/login/users/avatar/user_image_manager_browsertest.cc', |
+ 'browser/chromeos/login/users/avatar/user_image_manager_test_util.cc', |
+ 'browser/chromeos/login/users/avatar/user_image_manager_test_util.h', |
+ 'browser/chromeos/login/users/wallpaper/wallpaper_manager_policy_browsertest.cc', |
+ 'browser/chromeos/login/users/wallpaper/wallpaper_manager_test_utils.cc', |
+ 'browser/chromeos/login/users/wallpaper/wallpaper_manager_test_utils.h', |
'browser/chromeos/login/wizard_controller_browsertest.cc', |
- 'browser/chromeos/login/wizard_in_process_browser_test.cc', |
- 'browser/chromeos/login/wizard_in_process_browser_test.h', |
'browser/chromeos/memory/oom_priority_manager_browsertest.cc', |
'browser/chromeos/net/network_portal_detector_impl_browsertest.cc', |
'browser/chromeos/policy/device_local_account_browsertest.cc', |