| 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 | 6 |
| 7 #include "base/compiler_specific.h" | 7 #include "base/compiler_specific.h" |
| 8 #include "base/macros.h" | 8 #include "base/macros.h" |
| 9 #include "base/run_loop.h" | 9 #include "base/run_loop.h" |
| 10 #include "base/strings/utf_string_conversions.h" | 10 #include "base/strings/utf_string_conversions.h" |
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 61 public: | 61 public: |
| 62 SupervisedUserOwnerCreationTest() : SupervisedUserTestBase() {} | 62 SupervisedUserOwnerCreationTest() : SupervisedUserTestBase() {} |
| 63 | 63 |
| 64 void SetUpInProcessBrowserTestFixture() override { | 64 void SetUpInProcessBrowserTestFixture() override { |
| 65 SupervisedUserTestBase::SetUpInProcessBrowserTestFixture(); | 65 SupervisedUserTestBase::SetUpInProcessBrowserTestFixture(); |
| 66 cros_settings_provider_.reset(new StubCrosSettingsProvider()); | 66 cros_settings_provider_.reset(new StubCrosSettingsProvider()); |
| 67 cros_settings_provider_->Set(kDeviceOwner, base::StringValue(kTestManager)); | 67 cros_settings_provider_->Set(kDeviceOwner, base::StringValue(kTestManager)); |
| 68 } | 68 } |
| 69 | 69 |
| 70 private: | 70 private: |
| 71 scoped_ptr<StubCrosSettingsProvider> cros_settings_provider_; | 71 std::unique_ptr<StubCrosSettingsProvider> cros_settings_provider_; |
| 72 DISALLOW_COPY_AND_ASSIGN(SupervisedUserOwnerCreationTest); | 72 DISALLOW_COPY_AND_ASSIGN(SupervisedUserOwnerCreationTest); |
| 73 }; | 73 }; |
| 74 | 74 |
| 75 class SupervisedUserTransactionCleanupTest2 | 75 class SupervisedUserTransactionCleanupTest2 |
| 76 : public SupervisedUserTransactionCleanupTest { | 76 : public SupervisedUserTransactionCleanupTest { |
| 77 public: | 77 public: |
| 78 SupervisedUserTransactionCleanupTest2() | 78 SupervisedUserTransactionCleanupTest2() |
| 79 : SupervisedUserTransactionCleanupTest() {} | 79 : SupervisedUserTransactionCleanupTest() {} |
| 80 | 80 |
| 81 void SetUpInProcessBrowserTestFixture() override { | 81 void SetUpInProcessBrowserTestFixture() override { |
| (...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 187 IN_PROC_BROWSER_TEST_( | 187 IN_PROC_BROWSER_TEST_( |
| 188 SupervisedUserTransactionCleanupTest, | 188 SupervisedUserTransactionCleanupTest, |
| 189 CreateAndCancelSupervisedUser, | 189 CreateAndCancelSupervisedUser, |
| 190 SupervisedUserTransactionCleanupTest2, | 190 SupervisedUserTransactionCleanupTest2, |
| 191 testing::internal::GetTypeId<SupervisedUserTransactionCleanupTest>()) { | 191 testing::internal::GetTypeId<SupervisedUserTransactionCleanupTest>()) { |
| 192 // Make sure there is no supervised user in list. | 192 // Make sure there is no supervised user in list. |
| 193 ASSERT_EQ(2UL, user_manager::UserManager::Get()->GetUsers().size()); | 193 ASSERT_EQ(2UL, user_manager::UserManager::Get()->GetUsers().size()); |
| 194 } | 194 } |
| 195 | 195 |
| 196 } // namespace chromeos | 196 } // namespace chromeos |
| OLD | NEW |