| 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 "chrome/browser/ui/ash/session_state_delegate_chromeos.h" | 5 #include "chrome/browser/ui/ash/session_state_delegate_chromeos.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/run_loop.h" | 10 #include "base/run_loop.h" |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 43 } // namespace | 43 } // namespace |
| 44 | 44 |
| 45 class SessionStateDelegateChromeOSTest : public testing::Test { | 45 class SessionStateDelegateChromeOSTest : public testing::Test { |
| 46 protected: | 46 protected: |
| 47 SessionStateDelegateChromeOSTest() : user_manager_(NULL) { | 47 SessionStateDelegateChromeOSTest() : user_manager_(NULL) { |
| 48 } | 48 } |
| 49 | 49 |
| 50 virtual ~SessionStateDelegateChromeOSTest() { | 50 virtual ~SessionStateDelegateChromeOSTest() { |
| 51 } | 51 } |
| 52 | 52 |
| 53 virtual void SetUp() OVERRIDE { | 53 virtual void SetUp() override { |
| 54 // Initialize the UserManager singleton to a fresh FakeUserManager instance. | 54 // Initialize the UserManager singleton to a fresh FakeUserManager instance. |
| 55 user_manager_ = new chromeos::FakeUserManager; | 55 user_manager_ = new chromeos::FakeUserManager; |
| 56 user_manager_enabler_.reset( | 56 user_manager_enabler_.reset( |
| 57 new chromeos::ScopedUserManagerEnabler(user_manager_)); | 57 new chromeos::ScopedUserManagerEnabler(user_manager_)); |
| 58 | 58 |
| 59 // Create our SessionStateDelegate to experiment with. | 59 // Create our SessionStateDelegate to experiment with. |
| 60 session_state_delegate_.reset(new SessionStateDelegateChromeos()); | 60 session_state_delegate_.reset(new SessionStateDelegateChromeos()); |
| 61 testing::Test::SetUp(); | 61 testing::Test::SetUp(); |
| 62 } | 62 } |
| 63 | 63 |
| 64 virtual void TearDown() OVERRIDE { | 64 virtual void TearDown() override { |
| 65 testing::Test::TearDown(); | 65 testing::Test::TearDown(); |
| 66 session_state_delegate_.reset(); | 66 session_state_delegate_.reset(); |
| 67 user_manager_enabler_.reset(); | 67 user_manager_enabler_.reset(); |
| 68 user_manager_ = NULL; | 68 user_manager_ = NULL; |
| 69 // Clear our cached pointer to the PolicyCertVerifier. | 69 // Clear our cached pointer to the PolicyCertVerifier. |
| 70 g_policy_cert_verifier_for_factory = NULL; | 70 g_policy_cert_verifier_for_factory = NULL; |
| 71 profile_manager_.reset(); | 71 profile_manager_.reset(); |
| 72 | 72 |
| 73 // We must ensure that the PolicyCertVerifier outlives the | 73 // We must ensure that the PolicyCertVerifier outlives the |
| 74 // PolicyCertService so shutdown the profile here. Additionally, we need | 74 // PolicyCertService so shutdown the profile here. Additionally, we need |
| (...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 282 prefs::kMultiProfileUserBehavior, | 282 prefs::kMultiProfileUserBehavior, |
| 283 chromeos::MultiProfileUserController::kBehaviorNotAllowed); | 283 chromeos::MultiProfileUserController::kBehaviorNotAllowed); |
| 284 user_manager()->AddUser("bb@b.b"); | 284 user_manager()->AddUser("bb@b.b"); |
| 285 EXPECT_FALSE( | 285 EXPECT_FALSE( |
| 286 session_state_delegate()->CanAddUserToMultiProfile(&add_user_error)); | 286 session_state_delegate()->CanAddUserToMultiProfile(&add_user_error)); |
| 287 EXPECT_EQ(ash::SessionStateDelegate::ADD_USER_ERROR_NOT_ALLOWED_PRIMARY_USER, | 287 EXPECT_EQ(ash::SessionStateDelegate::ADD_USER_ERROR_NOT_ALLOWED_PRIMARY_USER, |
| 288 add_user_error); | 288 add_user_error); |
| 289 } | 289 } |
| 290 | 290 |
| 291 } // namespace chromeos | 291 } // namespace chromeos |
| OLD | NEW |