OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 <vector> | 5 #include <vector> |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/bind_helpers.h" | 8 #include "base/bind_helpers.h" |
9 #include "base/callback.h" | 9 #include "base/callback.h" |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
11 #include "base/location.h" | 11 #include "base/location.h" |
12 #include "base/memory/ref_counted.h" | 12 #include "base/memory/ref_counted.h" |
13 #include "base/run_loop.h" | 13 #include "base/run_loop.h" |
14 #include "chrome/browser/chrome_notification_types.h" | 14 #include "chrome/browser/chrome_notification_types.h" |
15 #include "chrome/browser/chromeos/login/auth/mock_url_fetchers.h" | 15 #include "chrome/browser/chromeos/login/auth/mock_url_fetchers.h" |
16 #include "chrome/browser/chromeos/login/existing_user_controller.h" | 16 #include "chrome/browser/chromeos/login/existing_user_controller.h" |
17 #include "chrome/browser/chromeos/login/helper.h" | 17 #include "chrome/browser/chromeos/login/helper.h" |
18 #include "chrome/browser/chromeos/login/mock_login_utils.h" | 18 #include "chrome/browser/chromeos/login/mock_login_utils.h" |
19 #include "chrome/browser/chromeos/login/ui/mock_login_display.h" | 19 #include "chrome/browser/chromeos/login/ui/mock_login_display.h" |
20 #include "chrome/browser/chromeos/login/ui/mock_login_display_host.h" | 20 #include "chrome/browser/chromeos/login/ui/mock_login_display_host.h" |
21 #include "chrome/browser/chromeos/login/users/mock_user_manager.h" | 21 #include "chrome/browser/chromeos/login/users/mock_user_manager.h" |
22 #include "chrome/browser/chromeos/login/users/user_manager.h" | 22 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h" |
23 #include "chrome/browser/chromeos/login/wizard_controller.h" | 23 #include "chrome/browser/chromeos/login/wizard_controller.h" |
24 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" | 24 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" |
25 #include "chrome/browser/chromeos/policy/device_local_account.h" | 25 #include "chrome/browser/chromeos/policy/device_local_account.h" |
26 #include "chrome/browser/chromeos/policy/device_local_account_policy_service.h" | 26 #include "chrome/browser/chromeos/policy/device_local_account_policy_service.h" |
27 #include "chrome/browser/chromeos/policy/device_policy_cros_browser_test.h" | 27 #include "chrome/browser/chromeos/policy/device_policy_cros_browser_test.h" |
28 #include "chrome/browser/chromeos/policy/proto/chrome_device_policy.pb.h" | 28 #include "chrome/browser/chromeos/policy/proto/chrome_device_policy.pb.h" |
29 #include "chrome/browser/chromeos/settings/cros_settings.h" | 29 #include "chrome/browser/chromeos/settings/cros_settings.h" |
30 #include "chrome/test/base/testing_browser_process.h" | 30 #include "chrome/test/base/testing_browser_process.h" |
31 #include "chrome/test/base/testing_profile.h" | 31 #include "chrome/test/base/testing_profile.h" |
32 #include "chrome/test/base/ui_test_utils.h" | 32 #include "chrome/test/base/ui_test_utils.h" |
33 #include "chromeos/chromeos_switches.h" | 33 #include "chromeos/chromeos_switches.h" |
34 #include "chromeos/dbus/fake_session_manager_client.h" | 34 #include "chromeos/dbus/fake_session_manager_client.h" |
35 #include "chromeos/login/auth/authenticator.h" | 35 #include "chromeos/login/auth/authenticator.h" |
36 #include "chromeos/login/auth/key.h" | 36 #include "chromeos/login/auth/key.h" |
37 #include "chromeos/login/auth/mock_authenticator.h" | 37 #include "chromeos/login/auth/mock_authenticator.h" |
38 #include "chromeos/login/auth/user_context.h" | 38 #include "chromeos/login/auth/user_context.h" |
39 #include "chromeos/settings/cros_settings_names.h" | 39 #include "chromeos/settings/cros_settings_names.h" |
40 #include "components/policy/core/common/cloud/cloud_policy_constants.h" | 40 #include "components/policy/core/common/cloud/cloud_policy_constants.h" |
41 #include "components/policy/core/common/cloud/cloud_policy_core.h" | 41 #include "components/policy/core/common/cloud/cloud_policy_core.h" |
42 #include "components/policy/core/common/cloud/cloud_policy_store.h" | 42 #include "components/policy/core/common/cloud/cloud_policy_store.h" |
43 #include "components/policy/core/common/cloud/mock_cloud_policy_store.h" | 43 #include "components/policy/core/common/cloud/mock_cloud_policy_store.h" |
44 #include "components/policy/core/common/cloud/policy_builder.h" | 44 #include "components/policy/core/common/cloud/policy_builder.h" |
45 #include "components/user_manager/user.h" | 45 #include "components/user_manager/user.h" |
| 46 #include "components/user_manager/user_manager.h" |
46 #include "components/user_manager/user_type.h" | 47 #include "components/user_manager/user_type.h" |
47 #include "content/public/test/mock_notification_observer.h" | 48 #include "content/public/test/mock_notification_observer.h" |
48 #include "content/public/test/test_utils.h" | 49 #include "content/public/test/test_utils.h" |
49 #include "google_apis/gaia/mock_url_fetcher_factory.h" | 50 #include "google_apis/gaia/mock_url_fetcher_factory.h" |
50 #include "testing/gmock/include/gmock/gmock.h" | 51 #include "testing/gmock/include/gmock/gmock.h" |
51 #include "testing/gtest/include/gtest/gtest.h" | 52 #include "testing/gtest/include/gtest/gtest.h" |
52 | 53 |
53 using ::testing::AnyNumber; | 54 using ::testing::AnyNumber; |
54 using ::testing::Invoke; | 55 using ::testing::Invoke; |
55 using ::testing::InvokeWithoutArgs; | 56 using ::testing::InvokeWithoutArgs; |
(...skipping 287 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
343 ExistingUserControllerPublicSessionTest() | 344 ExistingUserControllerPublicSessionTest() |
344 : public_session_user_id_(policy::GenerateDeviceLocalAccountUserId( | 345 : public_session_user_id_(policy::GenerateDeviceLocalAccountUserId( |
345 kPublicSessionAccountId, | 346 kPublicSessionAccountId, |
346 policy::DeviceLocalAccount::TYPE_PUBLIC_SESSION)) { | 347 policy::DeviceLocalAccount::TYPE_PUBLIC_SESSION)) { |
347 } | 348 } |
348 | 349 |
349 virtual void SetUpOnMainThread() OVERRIDE { | 350 virtual void SetUpOnMainThread() OVERRIDE { |
350 ExistingUserControllerTest::SetUpOnMainThread(); | 351 ExistingUserControllerTest::SetUpOnMainThread(); |
351 | 352 |
352 // Wait for the public session user to be created. | 353 // Wait for the public session user to be created. |
353 if (!chromeos::UserManager::Get()->IsKnownUser(public_session_user_id_)) { | 354 if (!user_manager::UserManager::Get()->IsKnownUser( |
| 355 public_session_user_id_)) { |
354 content::WindowedNotificationObserver( | 356 content::WindowedNotificationObserver( |
355 chrome::NOTIFICATION_USER_LIST_CHANGED, | 357 chrome::NOTIFICATION_USER_LIST_CHANGED, |
356 base::Bind(&chromeos::UserManager::IsKnownUser, | 358 base::Bind(&user_manager::UserManager::IsKnownUser, |
357 base::Unretained(chromeos::UserManager::Get()), | 359 base::Unretained(user_manager::UserManager::Get()), |
358 public_session_user_id_)).Wait(); | 360 public_session_user_id_)).Wait(); |
359 } | 361 } |
360 | 362 |
361 // Wait for the device local account policy to be installed. | 363 // Wait for the device local account policy to be installed. |
362 policy::CloudPolicyStore* store = | 364 policy::CloudPolicyStore* store = |
363 TestingBrowserProcess::GetGlobal() | 365 TestingBrowserProcess::GetGlobal() |
364 ->platform_part() | 366 ->platform_part() |
365 ->browser_policy_connector_chromeos() | 367 ->browser_policy_connector_chromeos() |
366 ->GetDeviceLocalAccountPolicyService() | 368 ->GetDeviceLocalAccountPolicyService() |
367 ->GetBrokerForUser(public_session_user_id_) | 369 ->GetBrokerForUser(public_session_user_id_) |
(...skipping 310 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
678 // First run propagates public accounts and stores them in Local State. | 680 // First run propagates public accounts and stores them in Local State. |
679 } | 681 } |
680 | 682 |
681 // See http://crbug.com/393704; flaky. | 683 // See http://crbug.com/393704; flaky. |
682 IN_PROC_BROWSER_TEST_F(ExistingUserControllerPublicSessionTest, | 684 IN_PROC_BROWSER_TEST_F(ExistingUserControllerPublicSessionTest, |
683 DISABLED_TestLoadingPublicUsersFromLocalState) { | 685 DISABLED_TestLoadingPublicUsersFromLocalState) { |
684 // Second run loads list of public accounts from Local State. | 686 // Second run loads list of public accounts from Local State. |
685 } | 687 } |
686 | 688 |
687 } // namespace chromeos | 689 } // namespace chromeos |
OLD | NEW |