OLD | NEW |
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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 <map> | 5 #include <map> |
6 #include <string> | 6 #include <string> |
7 | 7 |
8 #include "apps/app_window_registry.h" | 8 #include "apps/app_window_registry.h" |
9 #include "apps/ui/native_app_window.h" | 9 #include "apps/ui/native_app_window.h" |
10 #include "ash/shell.h" | 10 #include "ash/shell.h" |
(...skipping 27 matching lines...) Expand all Loading... |
38 #include "chrome/browser/chromeos/extensions/device_local_account_external_polic
y_loader.h" | 38 #include "chrome/browser/chromeos/extensions/device_local_account_external_polic
y_loader.h" |
39 #include "chrome/browser/chromeos/extensions/external_cache.h" | 39 #include "chrome/browser/chromeos/extensions/external_cache.h" |
40 #include "chrome/browser/chromeos/login/existing_user_controller.h" | 40 #include "chrome/browser/chromeos/login/existing_user_controller.h" |
41 #include "chrome/browser/chromeos/login/screens/wizard_screen.h" | 41 #include "chrome/browser/chromeos/login/screens/wizard_screen.h" |
42 #include "chrome/browser/chromeos/login/ui/login_display_host.h" | 42 #include "chrome/browser/chromeos/login/ui/login_display_host.h" |
43 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h" | 43 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h" |
44 #include "chrome/browser/chromeos/login/ui/webui_login_view.h" | 44 #include "chrome/browser/chromeos/login/ui/webui_login_view.h" |
45 #include "chrome/browser/chromeos/login/users/avatar/user_image_manager.h" | 45 #include "chrome/browser/chromeos/login/users/avatar/user_image_manager.h" |
46 #include "chrome/browser/chromeos/login/users/avatar/user_image_manager_impl.h" | 46 #include "chrome/browser/chromeos/login/users/avatar/user_image_manager_impl.h" |
47 #include "chrome/browser/chromeos/login/users/avatar/user_image_manager_test_uti
l.h" | 47 #include "chrome/browser/chromeos/login/users/avatar/user_image_manager_test_uti
l.h" |
| 48 #include "chrome/browser/chromeos/login/users/chrome_user_manager.h" |
48 #include "chrome/browser/chromeos/login/users/user_manager.h" | 49 #include "chrome/browser/chromeos/login/users/user_manager.h" |
49 #include "chrome/browser/chromeos/login/users/user_manager_impl.h" | |
50 #include "chrome/browser/chromeos/login/wizard_controller.h" | 50 #include "chrome/browser/chromeos/login/wizard_controller.h" |
51 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" | 51 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" |
52 #include "chrome/browser/chromeos/policy/cloud_external_data_manager_base_test_u
til.h" | 52 #include "chrome/browser/chromeos/policy/cloud_external_data_manager_base_test_u
til.h" |
53 #include "chrome/browser/chromeos/policy/device_local_account.h" | 53 #include "chrome/browser/chromeos/policy/device_local_account.h" |
54 #include "chrome/browser/chromeos/policy/device_local_account_policy_service.h" | 54 #include "chrome/browser/chromeos/policy/device_local_account_policy_service.h" |
55 #include "chrome/browser/chromeos/policy/device_policy_builder.h" | 55 #include "chrome/browser/chromeos/policy/device_policy_builder.h" |
56 #include "chrome/browser/chromeos/policy/device_policy_cros_browser_test.h" | 56 #include "chrome/browser/chromeos/policy/device_policy_cros_browser_test.h" |
57 #include "chrome/browser/chromeos/policy/proto/chrome_device_policy.pb.h" | 57 #include "chrome/browser/chromeos/policy/proto/chrome_device_policy.pb.h" |
58 #include "chrome/browser/extensions/crx_installer.h" | 58 #include "chrome/browser/extensions/crx_installer.h" |
59 #include "chrome/browser/extensions/extension_service.h" | 59 #include "chrome/browser/extensions/extension_service.h" |
(...skipping 805 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
865 ASSERT_TRUE(cache); | 865 ASSERT_TRUE(cache); |
866 EXPECT_FALSE(cache->GetExtension(kGoodExtensionID, NULL, NULL)); | 866 EXPECT_FALSE(cache->GetExtension(kGoodExtensionID, NULL, NULL)); |
867 } | 867 } |
868 | 868 |
869 IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, ExternalData) { | 869 IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, ExternalData) { |
870 // chromeos::UserManager requests an external data fetch whenever | 870 // chromeos::UserManager requests an external data fetch whenever |
871 // the key::kUserAvatarImage policy is set. Since this test wants to | 871 // the key::kUserAvatarImage policy is set. Since this test wants to |
872 // verify that the underlying policy subsystem will start a fetch | 872 // verify that the underlying policy subsystem will start a fetch |
873 // without this request as well, the chromeos::UserManager must be | 873 // without this request as well, the chromeos::UserManager must be |
874 // prevented from seeing the policy change. | 874 // prevented from seeing the policy change. |
875 reinterpret_cast<chromeos::UserManagerImpl*>(chromeos::UserManager::Get())-> | 875 reinterpret_cast<chromeos::ChromeUserManager*>(chromeos::UserManager::Get()) |
876 StopPolicyObserverForTesting(); | 876 ->StopPolicyObserverForTesting(); |
877 | 877 |
878 UploadDeviceLocalAccountPolicy(); | 878 UploadDeviceLocalAccountPolicy(); |
879 AddPublicSessionToDevicePolicy(kAccountId1); | 879 AddPublicSessionToDevicePolicy(kAccountId1); |
880 | 880 |
881 // This observes the display name becoming available as this indicates | 881 // This observes the display name becoming available as this indicates |
882 // device-local account policy is fully loaded. | 882 // device-local account policy is fully loaded. |
883 content::WindowedNotificationObserver( | 883 content::WindowedNotificationObserver( |
884 chrome::NOTIFICATION_USER_LIST_CHANGED, | 884 chrome::NOTIFICATION_USER_LIST_CHANGED, |
885 base::Bind(&DisplayNameMatches, user_id_1_, kDisplayName)).Wait(); | 885 base::Bind(&DisplayNameMatches, user_id_1_, kDisplayName)).Wait(); |
886 | 886 |
(...skipping 512 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1399 if (!IsSessionStarted()) { | 1399 if (!IsSessionStarted()) { |
1400 content::WindowedNotificationObserver(chrome::NOTIFICATION_SESSION_STARTED, | 1400 content::WindowedNotificationObserver(chrome::NOTIFICATION_SESSION_STARTED, |
1401 base::Bind(IsSessionStarted)).Wait(); | 1401 base::Bind(IsSessionStarted)).Wait(); |
1402 } | 1402 } |
1403 } | 1403 } |
1404 | 1404 |
1405 INSTANTIATE_TEST_CASE_P(TermsOfServiceTestInstance, | 1405 INSTANTIATE_TEST_CASE_P(TermsOfServiceTestInstance, |
1406 TermsOfServiceTest, testing::Bool()); | 1406 TermsOfServiceTest, testing::Bool()); |
1407 | 1407 |
1408 } // namespace policy | 1408 } // namespace policy |
OLD | NEW |