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 "chrome/browser/chromeos/login/supervised/supervised_user_test_base.h" | 5 #include "chrome/browser/chromeos/login/supervised/supervised_user_test_base.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 | 8 |
9 #include "base/compiler_specific.h" | 9 #include "base/compiler_specific.h" |
10 #include "base/run_loop.h" | 10 #include "base/run_loop.h" |
(...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
196 network_portal_detector_ = new NetworkPortalDetectorTestImpl(); | 196 network_portal_detector_ = new NetworkPortalDetectorTestImpl(); |
197 NetworkPortalDetector::InitializeForTesting(network_portal_detector_); | 197 NetworkPortalDetector::InitializeForTesting(network_portal_detector_); |
198 NetworkPortalDetector::CaptivePortalState online_state; | 198 NetworkPortalDetector::CaptivePortalState online_state; |
199 online_state.status = NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_ONLINE; | 199 online_state.status = NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_ONLINE; |
200 online_state.response_code = 204; | 200 online_state.response_code = 204; |
201 network_portal_detector_->SetDefaultNetworkForTesting(kStubEthernetGuid); | 201 network_portal_detector_->SetDefaultNetworkForTesting(kStubEthernetGuid); |
202 network_portal_detector_->SetDetectionResultsForTesting(kStubEthernetGuid, | 202 network_portal_detector_->SetDetectionResultsForTesting(kStubEthernetGuid, |
203 online_state); | 203 online_state); |
204 } | 204 } |
205 | 205 |
206 void SupervisedUserTestBase::CleanUpOnMainThread() { | |
207 LoginManagerTest::CleanUpOnMainThread(); | |
208 } | |
209 | |
210 void SupervisedUserTestBase::TearDown() { | 206 void SupervisedUserTestBase::TearDown() { |
211 cryptohome::AsyncMethodCaller::Shutdown(); | 207 cryptohome::AsyncMethodCaller::Shutdown(); |
212 cryptohome::HomedirMethods::Shutdown(); | 208 cryptohome::HomedirMethods::Shutdown(); |
213 mock_homedir_methods_ = NULL; | 209 mock_homedir_methods_ = NULL; |
214 mock_async_method_caller_ = NULL; | 210 mock_async_method_caller_ = NULL; |
215 LoginManagerTest::TearDown(); | 211 LoginManagerTest::TearDown(); |
216 } | 212 } |
217 | 213 |
218 void SupervisedUserTestBase::TearDownInProcessBrowserTestFixture() { | 214 void SupervisedUserTestBase::TearDownInProcessBrowserTestFixture() { |
219 NetworkPortalDetector::Shutdown(); | 215 NetworkPortalDetector::Shutdown(); |
(...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
427 // Confirm deletion. | 423 // Confirm deletion. |
428 JSEval(StringPrintf( | 424 JSEval(StringPrintf( |
429 "$('pod-row').pods[%d].querySelector('.remove-warning-button').click()", | 425 "$('pod-row').pods[%d].querySelector('.remove-warning-button').click()", |
430 user_index)); | 426 user_index)); |
431 | 427 |
432 // Make sure there is no supervised user in list. | 428 // Make sure there is no supervised user in list. |
433 ASSERT_EQ(original_user_count - 1, UserManager::Get()->GetUsers().size()); | 429 ASSERT_EQ(original_user_count - 1, UserManager::Get()->GetUsers().size()); |
434 } | 430 } |
435 | 431 |
436 } // namespace chromeos | 432 } // namespace chromeos |
OLD | NEW |