OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 <string> | 5 #include <string> |
6 #include <vector> | 6 #include <vector> |
7 | 7 |
8 #include "base/bind.h" | 8 #include "base/bind.h" |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/macros.h" | 10 #include "base/macros.h" |
11 #include "base/run_loop.h" | 11 #include "base/run_loop.h" |
12 #include "base/stl_util.h" | 12 #include "base/stl_util.h" |
13 #include "base/strings/string_util.h" | 13 #include "base/strings/string_util.h" |
14 #include "chrome/browser/browser_process.h" | 14 #include "chrome/browser/browser_process.h" |
15 #include "chrome/browser/chrome_notification_types.h" | 15 #include "chrome/browser/chrome_notification_types.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/test/oobe_base_test.h" | 17 #include "chrome/browser/chromeos/login/test/oobe_base_test.h" |
18 #include "chrome/browser/chromeos/login/ui/webui_login_display.h" | 18 #include "chrome/browser/chromeos/login/ui/webui_login_display.h" |
19 #include "chrome/browser/chromeos/login/wizard_controller.h" | 19 #include "chrome/browser/chromeos/login/wizard_controller.h" |
20 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" | 20 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" |
21 #include "chrome/browser/chromeos/policy/enterprise_install_attributes.h" | 21 #include "chrome/browser/chromeos/settings/install_attributes.h" |
22 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h" | 22 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h" |
23 #include "chrome/common/chrome_switches.h" | 23 #include "chrome/common/chrome_switches.h" |
24 #include "chrome/test/base/in_process_browser_test.h" | 24 #include "chrome/test/base/in_process_browser_test.h" |
25 #include "chromeos/chromeos_switches.h" | 25 #include "chromeos/chromeos_switches.h" |
26 #include "components/policy/core/common/cloud/device_management_service.h" | 26 #include "components/policy/core/common/cloud/device_management_service.h" |
27 #include "components/policy/core/common/policy_switches.h" | 27 #include "components/policy/core/common/policy_switches.h" |
28 #include "components/policy/proto/device_management_backend.pb.h" | 28 #include "components/policy/proto/device_management_backend.pb.h" |
29 #include "components/user_manager/user_manager.h" | 29 #include "components/user_manager/user_manager.h" |
30 #include "content/public/browser/notification_observer.h" | 30 #include "content/public/browser/notification_observer.h" |
31 #include "content/public/browser/notification_registrar.h" | 31 #include "content/public/browser/notification_registrar.h" |
(...skipping 29 matching lines...) Expand all Loading... |
61 const char kOAuth2AccessTokenData[] = | 61 const char kOAuth2AccessTokenData[] = |
62 "{" | 62 "{" |
63 " \"access_token\": \"5678\"," | 63 " \"access_token\": \"5678\"," |
64 " \"expires_in\": 3600" | 64 " \"expires_in\": 3600" |
65 "}"; | 65 "}"; |
66 | 66 |
67 const char kDMRegisterRequest[] = "/device_management?request=register"; | 67 const char kDMRegisterRequest[] = "/device_management?request=register"; |
68 const char kDMPolicyRequest[] = "/device_management?request=policy"; | 68 const char kDMPolicyRequest[] = "/device_management?request=policy"; |
69 | 69 |
70 void CopyLockResult(base::RunLoop* loop, | 70 void CopyLockResult(base::RunLoop* loop, |
71 policy::EnterpriseInstallAttributes::LockResult* out, | 71 InstallAttributes::LockResult* out, |
72 policy::EnterpriseInstallAttributes::LockResult result) { | 72 InstallAttributes::LockResult result) { |
73 *out = result; | 73 *out = result; |
74 loop->Quit(); | 74 loop->Quit(); |
75 } | 75 } |
76 | 76 |
77 } // namespace | 77 } // namespace |
78 | 78 |
79 struct BlockingLoginTestParam { | 79 struct BlockingLoginTestParam { |
80 const int steps; | 80 const int steps; |
81 const char* username; | 81 const char* username; |
82 const bool enroll_device; | 82 const bool enroll_device; |
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
133 base::RunLoop().RunUntilIdle(); | 133 base::RunLoop().RunUntilIdle(); |
134 } | 134 } |
135 | 135 |
136 policy::BrowserPolicyConnectorChromeOS* browser_policy_connector() { | 136 policy::BrowserPolicyConnectorChromeOS* browser_policy_connector() { |
137 return g_browser_process->platform_part() | 137 return g_browser_process->platform_part() |
138 ->browser_policy_connector_chromeos(); | 138 ->browser_policy_connector_chromeos(); |
139 } | 139 } |
140 | 140 |
141 void EnrollDevice(const std::string& username) { | 141 void EnrollDevice(const std::string& username) { |
142 base::RunLoop loop; | 142 base::RunLoop loop; |
143 policy::EnterpriseInstallAttributes::LockResult result; | 143 InstallAttributes::LockResult result; |
144 browser_policy_connector()->GetInstallAttributes()->LockDevice( | 144 browser_policy_connector()->GetInstallAttributes()->LockDevice( |
145 username, policy::DEVICE_MODE_ENTERPRISE, "100200300", | 145 username, policy::DEVICE_MODE_ENTERPRISE, "100200300", |
146 base::Bind(&CopyLockResult, &loop, &result)); | 146 base::Bind(&CopyLockResult, &loop, &result)); |
147 loop.Run(); | 147 loop.Run(); |
148 EXPECT_EQ(policy::EnterpriseInstallAttributes::LOCK_SUCCESS, result); | 148 EXPECT_EQ(InstallAttributes::LOCK_SUCCESS, result); |
149 RunUntilIdle(); | 149 RunUntilIdle(); |
150 } | 150 } |
151 | 151 |
152 void Login(const std::string& username) { | 152 void Login(const std::string& username) { |
153 content::WindowedNotificationObserver session_started_observer( | 153 content::WindowedNotificationObserver session_started_observer( |
154 chrome::NOTIFICATION_SESSION_STARTED, | 154 chrome::NOTIFICATION_SESSION_STARTED, |
155 content::NotificationService::AllSources()); | 155 content::NotificationService::AllSources()); |
156 | 156 |
157 ExistingUserController* controller = | 157 ExistingUserController* controller = |
158 ExistingUserController::current_controller(); | 158 ExistingUserController::current_controller(); |
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
331 {3, kUsernameOtherDomain, true}, | 331 {3, kUsernameOtherDomain, true}, |
332 {4, kUsernameOtherDomain, true}, | 332 {4, kUsernameOtherDomain, true}, |
333 {5, kUsernameOtherDomain, true}, | 333 {5, kUsernameOtherDomain, true}, |
334 }; | 334 }; |
335 | 335 |
336 INSTANTIATE_TEST_CASE_P(BlockingLoginTestInstance, | 336 INSTANTIATE_TEST_CASE_P(BlockingLoginTestInstance, |
337 BlockingLoginTest, | 337 BlockingLoginTest, |
338 testing::ValuesIn(kBlockinLoginTestCases)); | 338 testing::ValuesIn(kBlockinLoginTestCases)); |
339 | 339 |
340 } // namespace chromeos | 340 } // namespace chromeos |
OLD | NEW |