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 | 6 |
7 | 7 |
8 #include "base/compiler_specific.h" | 8 #include "base/compiler_specific.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 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
65 scoped_utility_.reset( | 65 scoped_utility_.reset( |
66 new ScopedTestingManagedUserRegistrationUtility( | 66 new ScopedTestingManagedUserRegistrationUtility( |
67 registration_utility_stub_)); | 67 registration_utility_stub_)); |
68 | 68 |
69 // Setup network portal detector to return online state for both | 69 // Setup network portal detector to return online state for both |
70 // ethernet and wifi networks. Ethernet is an active network by | 70 // ethernet and wifi networks. Ethernet is an active network by |
71 // default. | 71 // default. |
72 network_portal_detector_ = new NetworkPortalDetectorTestImpl(); | 72 network_portal_detector_ = new NetworkPortalDetectorTestImpl(); |
73 NetworkPortalDetector::InitializeForTesting(network_portal_detector_); | 73 NetworkPortalDetector::InitializeForTesting(network_portal_detector_); |
74 NetworkPortalDetector::CaptivePortalState online_state; | 74 NetworkPortalDetector::CaptivePortalState online_state; |
75 online_state.status = NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_ONLINE; | 75 online_state.status = captive_portal::CAPTIVE_PORTAL_STATUS_ONLINE; |
76 online_state.response_code = 204; | 76 online_state.response_code = 204; |
77 network_portal_detector_->SetDefaultNetworkPathForTesting( | 77 network_portal_detector_->SetDefaultNetworkPathForTesting( |
78 kStubEthernetServicePath); | 78 kStubEthernetServicePath); |
79 network_portal_detector_->SetDetectionResultsForTesting( | 79 network_portal_detector_->SetDetectionResultsForTesting( |
80 kStubEthernetServicePath, online_state); | 80 kStubEthernetServicePath, online_state); |
81 } | 81 } |
82 | 82 |
83 virtual void CleanUpOnMainThread() OVERRIDE { | 83 virtual void CleanUpOnMainThread() OVERRIDE { |
84 LoginManagerTest::CleanUpOnMainThread(); | 84 LoginManagerTest::CleanUpOnMainThread(); |
85 scoped_utility_.reset(NULL); | 85 scoped_utility_.reset(NULL); |
(...skipping 294 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
380 JSEval("$('cancel-add-user-button').click()"); | 380 JSEval("$('cancel-add-user-button').click()"); |
381 } | 381 } |
382 | 382 |
383 IN_PROC_BROWSER_TEST_F(SupervisedUserTransactionCleanupTest, | 383 IN_PROC_BROWSER_TEST_F(SupervisedUserTransactionCleanupTest, |
384 CreateAndCancelSupervisedUser) { | 384 CreateAndCancelSupervisedUser) { |
385 // Make sure there is no supervised user in list. | 385 // Make sure there is no supervised user in list. |
386 ASSERT_EQ(2UL, UserManager::Get()->GetUsers().size()); | 386 ASSERT_EQ(2UL, UserManager::Get()->GetUsers().size()); |
387 } | 387 } |
388 | 388 |
389 } // namespace chromeos | 389 } // namespace chromeos |
OLD | NEW |