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/run_loop.h" | 8 #include "base/run_loop.h" |
9 #include "base/strings/utf_string_conversions.h" | 9 #include "base/strings/utf_string_conversions.h" |
10 #include "base/threading/sequenced_worker_pool.h" | 10 #include "base/threading/sequenced_worker_pool.h" |
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
56 SupervisedUserTransactionCleanupTest() : SupervisedUserTestBase() {} | 56 SupervisedUserTransactionCleanupTest() : SupervisedUserTestBase() {} |
57 | 57 |
58 private: | 58 private: |
59 DISALLOW_COPY_AND_ASSIGN(SupervisedUserTransactionCleanupTest); | 59 DISALLOW_COPY_AND_ASSIGN(SupervisedUserTransactionCleanupTest); |
60 }; | 60 }; |
61 | 61 |
62 class SupervisedUserOwnerCreationTest : public SupervisedUserTestBase { | 62 class SupervisedUserOwnerCreationTest : public SupervisedUserTestBase { |
63 public: | 63 public: |
64 SupervisedUserOwnerCreationTest() : SupervisedUserTestBase() {} | 64 SupervisedUserOwnerCreationTest() : SupervisedUserTestBase() {} |
65 | 65 |
66 virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { | 66 virtual void SetUpInProcessBrowserTestFixture() override { |
67 SupervisedUserTestBase::SetUpInProcessBrowserTestFixture(); | 67 SupervisedUserTestBase::SetUpInProcessBrowserTestFixture(); |
68 cros_settings_provider_.reset(new StubCrosSettingsProvider()); | 68 cros_settings_provider_.reset(new StubCrosSettingsProvider()); |
69 cros_settings_provider_->Set(kDeviceOwner, base::StringValue(kTestManager)); | 69 cros_settings_provider_->Set(kDeviceOwner, base::StringValue(kTestManager)); |
70 } | 70 } |
71 | 71 |
72 private: | 72 private: |
73 scoped_ptr<StubCrosSettingsProvider> cros_settings_provider_; | 73 scoped_ptr<StubCrosSettingsProvider> cros_settings_provider_; |
74 DISALLOW_COPY_AND_ASSIGN(SupervisedUserOwnerCreationTest); | 74 DISALLOW_COPY_AND_ASSIGN(SupervisedUserOwnerCreationTest); |
75 }; | 75 }; |
76 | 76 |
77 class SupervisedUserTransactionCleanupTest2 | 77 class SupervisedUserTransactionCleanupTest2 |
78 : public SupervisedUserTransactionCleanupTest { | 78 : public SupervisedUserTransactionCleanupTest { |
79 public: | 79 public: |
80 SupervisedUserTransactionCleanupTest2() | 80 SupervisedUserTransactionCleanupTest2() |
81 : SupervisedUserTransactionCleanupTest() {} | 81 : SupervisedUserTransactionCleanupTest() {} |
82 | 82 |
83 virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { | 83 virtual void SetUpInProcessBrowserTestFixture() override { |
84 SupervisedUserTransactionCleanupTest::SetUpInProcessBrowserTestFixture(); | 84 SupervisedUserTransactionCleanupTest::SetUpInProcessBrowserTestFixture(); |
85 EXPECT_CALL(*mock_async_method_caller_, AsyncRemove(_, _)).Times(1); | 85 EXPECT_CALL(*mock_async_method_caller_, AsyncRemove(_, _)).Times(1); |
86 } | 86 } |
87 | 87 |
88 private: | 88 private: |
89 DISALLOW_COPY_AND_ASSIGN(SupervisedUserTransactionCleanupTest2); | 89 DISALLOW_COPY_AND_ASSIGN(SupervisedUserTransactionCleanupTest2); |
90 }; | 90 }; |
91 | 91 |
92 IN_PROC_BROWSER_TEST_F(SupervisedUserCreationTest, | 92 IN_PROC_BROWSER_TEST_F(SupervisedUserCreationTest, |
93 DISABLED_PRE_PRE_PRE_CreateAndRemoveSupervisedUser) { | 93 DISABLED_PRE_PRE_PRE_CreateAndRemoveSupervisedUser) { |
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
168 IN_PROC_BROWSER_TEST_( | 168 IN_PROC_BROWSER_TEST_( |
169 SupervisedUserTransactionCleanupTest, | 169 SupervisedUserTransactionCleanupTest, |
170 DISABLED_CreateAndCancelSupervisedUser, | 170 DISABLED_CreateAndCancelSupervisedUser, |
171 SupervisedUserTransactionCleanupTest2, | 171 SupervisedUserTransactionCleanupTest2, |
172 testing::internal::GetTypeId<SupervisedUserTransactionCleanupTest>()) { | 172 testing::internal::GetTypeId<SupervisedUserTransactionCleanupTest>()) { |
173 // Make sure there is no supervised user in list. | 173 // Make sure there is no supervised user in list. |
174 ASSERT_EQ(2UL, user_manager::UserManager::Get()->GetUsers().size()); | 174 ASSERT_EQ(2UL, user_manager::UserManager::Get()->GetUsers().size()); |
175 } | 175 } |
176 | 176 |
177 } // namespace chromeos | 177 } // namespace chromeos |
OLD | NEW |