| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 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 <string> | 5 #include <string> |
| 6 #include <utility> |
| 6 | 7 |
| 7 #include "base/message_loop/message_loop.h" | 8 #include "base/message_loop/message_loop.h" |
| 8 #include "base/values.h" | 9 #include "base/values.h" |
| 9 #include "chrome/browser/chromeos/login/existing_user_controller.h" | 10 #include "chrome/browser/chromeos/login/existing_user_controller.h" |
| 10 #include "chrome/browser/chromeos/login/ui/mock_login_display.h" | 11 #include "chrome/browser/chromeos/login/ui/mock_login_display.h" |
| 11 #include "chrome/browser/chromeos/login/ui/mock_login_display_host.h" | 12 #include "chrome/browser/chromeos/login/ui/mock_login_display_host.h" |
| 12 #include "chrome/browser/chromeos/login/users/mock_user_manager.h" | 13 #include "chrome/browser/chromeos/login/users/mock_user_manager.h" |
| 13 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h" | 14 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h" |
| 14 #include "chrome/browser/chromeos/policy/device_local_account.h" | 15 #include "chrome/browser/chromeos/policy/device_local_account.h" |
| 15 #include "chrome/browser/chromeos/settings/cros_settings.h" | 16 #include "chrome/browser/chromeos/settings/cros_settings.h" |
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 63 existing_user_controller_.reset( | 64 existing_user_controller_.reset( |
| 64 new ExistingUserController(mock_login_display_host_.get())); | 65 new ExistingUserController(mock_login_display_host_.get())); |
| 65 | 66 |
| 66 std::unique_ptr<base::DictionaryValue> account(new base::DictionaryValue); | 67 std::unique_ptr<base::DictionaryValue> account(new base::DictionaryValue); |
| 67 account->SetStringWithoutPathExpansion( | 68 account->SetStringWithoutPathExpansion( |
| 68 kAccountsPrefDeviceLocalAccountsKeyId, auto_login_user_id_); | 69 kAccountsPrefDeviceLocalAccountsKeyId, auto_login_user_id_); |
| 69 account->SetIntegerWithoutPathExpansion( | 70 account->SetIntegerWithoutPathExpansion( |
| 70 kAccountsPrefDeviceLocalAccountsKeyType, | 71 kAccountsPrefDeviceLocalAccountsKeyType, |
| 71 policy::DeviceLocalAccount::TYPE_PUBLIC_SESSION); | 72 policy::DeviceLocalAccount::TYPE_PUBLIC_SESSION); |
| 72 base::ListValue accounts; | 73 base::ListValue accounts; |
| 73 accounts.Append(account.release()); | 74 accounts.Append(std::move(account)); |
| 74 CrosSettings::Get()->Set(kAccountsPrefDeviceLocalAccounts, accounts); | 75 CrosSettings::Get()->Set(kAccountsPrefDeviceLocalAccounts, accounts); |
| 75 | 76 |
| 76 // Prevent settings changes from auto-starting the timer. | 77 // Prevent settings changes from auto-starting the timer. |
| 77 existing_user_controller_-> | 78 existing_user_controller_-> |
| 78 local_account_auto_login_id_subscription_.reset(); | 79 local_account_auto_login_id_subscription_.reset(); |
| 79 existing_user_controller_-> | 80 existing_user_controller_-> |
| 80 local_account_auto_login_delay_subscription_.reset(); | 81 local_account_auto_login_delay_subscription_.reset(); |
| 81 } | 82 } |
| 82 | 83 |
| 83 const ExistingUserController* existing_user_controller() const { | 84 const ExistingUserController* existing_user_controller() const { |
| (...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 268 ConfigureAutoLogin(); | 269 ConfigureAutoLogin(); |
| 269 ASSERT_TRUE(auto_login_timer()); | 270 ASSERT_TRUE(auto_login_timer()); |
| 270 EXPECT_FALSE(auto_login_timer()->IsRunning()); | 271 EXPECT_FALSE(auto_login_timer()->IsRunning()); |
| 271 EXPECT_EQ(auto_login_timer()->GetCurrentDelay().InMilliseconds(), | 272 EXPECT_EQ(auto_login_timer()->GetCurrentDelay().InMilliseconds(), |
| 272 kAutoLoginDelay2); | 273 kAutoLoginDelay2); |
| 273 EXPECT_EQ(auto_login_account_id(), EmptyAccountId()); | 274 EXPECT_EQ(auto_login_account_id(), EmptyAccountId()); |
| 274 EXPECT_EQ(auto_login_delay(), kAutoLoginDelay2); | 275 EXPECT_EQ(auto_login_delay(), kAutoLoginDelay2); |
| 275 } | 276 } |
| 276 | 277 |
| 277 } // namespace chromeos | 278 } // namespace chromeos |
| OLD | NEW |