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/authenticator.h" | 15 #include "chrome/browser/chromeos/login/auth/authenticator.h" |
16 #include "chrome/browser/chromeos/login/auth/mock_authenticator.h" | 16 #include "chrome/browser/chromeos/login/auth/mock_authenticator.h" |
17 #include "chrome/browser/chromeos/login/auth/mock_url_fetchers.h" | 17 #include "chrome/browser/chromeos/login/auth/mock_url_fetchers.h" |
18 #include "chrome/browser/chromeos/login/existing_user_controller.h" | 18 #include "chrome/browser/chromeos/login/existing_user_controller.h" |
19 #include "chrome/browser/chromeos/login/helper.h" | 19 #include "chrome/browser/chromeos/login/helper.h" |
20 #include "chrome/browser/chromeos/login/mock_login_utils.h" | 20 #include "chrome/browser/chromeos/login/mock_login_utils.h" |
21 #include "chrome/browser/chromeos/login/ui/mock_login_display.h" | 21 #include "chrome/browser/chromeos/login/ui/mock_login_display.h" |
22 #include "chrome/browser/chromeos/login/ui/mock_login_display_host.h" | 22 #include "chrome/browser/chromeos/login/ui/mock_login_display_host.h" |
23 #include "chrome/browser/chromeos/login/users/mock_user_manager.h" | 23 #include "chrome/browser/chromeos/login/users/mock_user_manager.h" |
24 #include "chrome/browser/chromeos/login/users/user.h" | |
25 #include "chrome/browser/chromeos/login/users/user_manager.h" | 24 #include "chrome/browser/chromeos/login/users/user_manager.h" |
26 #include "chrome/browser/chromeos/login/wizard_controller.h" | 25 #include "chrome/browser/chromeos/login/wizard_controller.h" |
27 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" | 26 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" |
28 #include "chrome/browser/chromeos/policy/device_local_account.h" | 27 #include "chrome/browser/chromeos/policy/device_local_account.h" |
29 #include "chrome/browser/chromeos/policy/device_local_account_policy_service.h" | 28 #include "chrome/browser/chromeos/policy/device_local_account_policy_service.h" |
30 #include "chrome/browser/chromeos/policy/device_policy_cros_browser_test.h" | 29 #include "chrome/browser/chromeos/policy/device_policy_cros_browser_test.h" |
31 #include "chrome/browser/chromeos/policy/proto/chrome_device_policy.pb.h" | 30 #include "chrome/browser/chromeos/policy/proto/chrome_device_policy.pb.h" |
32 #include "chrome/browser/chromeos/settings/cros_settings.h" | 31 #include "chrome/browser/chromeos/settings/cros_settings.h" |
33 #include "chrome/test/base/testing_browser_process.h" | 32 #include "chrome/test/base/testing_browser_process.h" |
34 #include "chrome/test/base/testing_profile.h" | 33 #include "chrome/test/base/testing_profile.h" |
35 #include "chrome/test/base/ui_test_utils.h" | 34 #include "chrome/test/base/ui_test_utils.h" |
36 #include "chromeos/chromeos_switches.h" | 35 #include "chromeos/chromeos_switches.h" |
37 #include "chromeos/dbus/fake_session_manager_client.h" | 36 #include "chromeos/dbus/fake_session_manager_client.h" |
38 #include "chromeos/login/auth/key.h" | 37 #include "chromeos/login/auth/key.h" |
39 #include "chromeos/login/auth/user_context.h" | 38 #include "chromeos/login/auth/user_context.h" |
40 #include "chromeos/settings/cros_settings_names.h" | 39 #include "chromeos/settings/cros_settings_names.h" |
41 #include "components/policy/core/common/cloud/cloud_policy_constants.h" | 40 #include "components/policy/core/common/cloud/cloud_policy_constants.h" |
42 #include "components/policy/core/common/cloud/cloud_policy_core.h" | 41 #include "components/policy/core/common/cloud/cloud_policy_core.h" |
43 #include "components/policy/core/common/cloud/cloud_policy_store.h" | 42 #include "components/policy/core/common/cloud/cloud_policy_store.h" |
44 #include "components/policy/core/common/cloud/mock_cloud_policy_store.h" | 43 #include "components/policy/core/common/cloud/mock_cloud_policy_store.h" |
45 #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" |
46 #include "content/public/test/mock_notification_observer.h" | 46 #include "content/public/test/mock_notification_observer.h" |
47 #include "content/public/test/test_utils.h" | 47 #include "content/public/test/test_utils.h" |
48 #include "google_apis/gaia/mock_url_fetcher_factory.h" | 48 #include "google_apis/gaia/mock_url_fetcher_factory.h" |
49 #include "grit/generated_resources.h" | 49 #include "grit/generated_resources.h" |
50 #include "testing/gmock/include/gmock/gmock.h" | 50 #include "testing/gmock/include/gmock/gmock.h" |
51 #include "testing/gtest/include/gtest/gtest.h" | 51 #include "testing/gtest/include/gtest/gtest.h" |
52 #include "ui/base/l10n/l10n_util.h" | 52 #include "ui/base/l10n/l10n_util.h" |
53 | 53 |
54 using ::testing::AnyNumber; | 54 using ::testing::AnyNumber; |
55 using ::testing::Invoke; | 55 using ::testing::Invoke; |
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
161 EXPECT_CALL(*mock_user_manager_, Shutdown()) | 161 EXPECT_CALL(*mock_user_manager_, Shutdown()) |
162 .Times(1); | 162 .Times(1); |
163 } | 163 } |
164 | 164 |
165 virtual void SetUpOnMainThread() OVERRIDE { | 165 virtual void SetUpOnMainThread() OVERRIDE { |
166 testing_profile_.reset(new TestingProfile()); | 166 testing_profile_.reset(new TestingProfile()); |
167 SetUpUserManager(); | 167 SetUpUserManager(); |
168 existing_user_controller_.reset( | 168 existing_user_controller_.reset( |
169 new ExistingUserController(mock_login_display_host_.get())); | 169 new ExistingUserController(mock_login_display_host_.get())); |
170 ASSERT_EQ(existing_user_controller(), existing_user_controller_.get()); | 170 ASSERT_EQ(existing_user_controller(), existing_user_controller_.get()); |
171 existing_user_controller_->Init(UserList()); | 171 existing_user_controller_->Init(user_manager::UserList()); |
172 profile_prepared_cb_ = | 172 profile_prepared_cb_ = |
173 base::Bind(&ExistingUserController::OnProfilePrepared, | 173 base::Bind(&ExistingUserController::OnProfilePrepared, |
174 base::Unretained(existing_user_controller()), | 174 base::Unretained(existing_user_controller()), |
175 testing_profile_.get()); | 175 testing_profile_.get()); |
176 } | 176 } |
177 | 177 |
178 virtual void CleanUpOnMainThread() OVERRIDE { | 178 virtual void CleanUpOnMainThread() OVERRIDE { |
179 // ExistingUserController must be deleted before the thread is cleaned up: | 179 // ExistingUserController must be deleted before the thread is cleaned up: |
180 // If there is an outstanding login attempt when ExistingUserController is | 180 // If there is an outstanding login attempt when ExistingUserController is |
181 // deleted, its LoginPerformer instance will be deleted, which in turn | 181 // deleted, its LoginPerformer instance will be deleted, which in turn |
(...skipping 491 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
673 // First run propagates public accounts and stores them in Local State. | 673 // First run propagates public accounts and stores them in Local State. |
674 } | 674 } |
675 | 675 |
676 // See http://crbug.com/393704; flaky. | 676 // See http://crbug.com/393704; flaky. |
677 IN_PROC_BROWSER_TEST_F(ExistingUserControllerPublicSessionTest, | 677 IN_PROC_BROWSER_TEST_F(ExistingUserControllerPublicSessionTest, |
678 DISABLED_TestLoadingPublicUsersFromLocalState) { | 678 DISABLED_TestLoadingPublicUsersFromLocalState) { |
679 // Second run loads list of public accounts from Local State. | 679 // Second run loads list of public accounts from Local State. |
680 } | 680 } |
681 | 681 |
682 } // namespace chromeos | 682 } // namespace chromeos |
OLD | NEW |