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 "base/command_line.h" | 5 #include "base/command_line.h" |
6 #include "base/compiler_specific.h" | 6 #include "base/compiler_specific.h" |
7 #include "base/logging.h" | 7 #include "base/logging.h" |
8 #include "base/memory/scoped_ptr.h" | 8 #include "base/memory/scoped_ptr.h" |
9 #include "chrome/browser/chromeos/login/captive_portal_window_proxy.h" | 9 #include "chrome/browser/chromeos/login/captive_portal_window_proxy.h" |
10 #include "chrome/browser/chromeos/login/login_display_host_impl.h" | 10 #include "chrome/browser/chromeos/login/login_display_host_impl.h" |
(...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
179 CaptivePortalWindowCtorDtorTest() | 179 CaptivePortalWindowCtorDtorTest() |
180 : LoginManagerTest(false) {} | 180 : LoginManagerTest(false) {} |
181 virtual ~CaptivePortalWindowCtorDtorTest() {} | 181 virtual ~CaptivePortalWindowCtorDtorTest() {} |
182 | 182 |
183 virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { | 183 virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { |
184 LoginManagerTest::SetUpInProcessBrowserTestFixture(); | 184 LoginManagerTest::SetUpInProcessBrowserTestFixture(); |
185 | 185 |
186 network_portal_detector_ = new NetworkPortalDetectorTestImpl(); | 186 network_portal_detector_ = new NetworkPortalDetectorTestImpl(); |
187 NetworkPortalDetector::InitializeForTesting(network_portal_detector_); | 187 NetworkPortalDetector::InitializeForTesting(network_portal_detector_); |
188 NetworkPortalDetector::CaptivePortalState portal_state; | 188 NetworkPortalDetector::CaptivePortalState portal_state; |
189 portal_state.status = NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_PORTAL; | 189 portal_state.status = captive_portal::CAPTIVE_PORTAL_STATUS_PORTAL; |
190 portal_state.response_code = 200; | 190 portal_state.response_code = 200; |
191 network_portal_detector_->SetDefaultNetworkPathForTesting( | 191 network_portal_detector_->SetDefaultNetworkPathForTesting( |
192 kStubEthernetServicePath); | 192 kStubEthernetServicePath); |
193 network_portal_detector_->SetDetectionResultsForTesting( | 193 network_portal_detector_->SetDetectionResultsForTesting( |
194 kStubEthernetServicePath, portal_state); | 194 kStubEthernetServicePath, portal_state); |
195 } | 195 } |
196 | 196 |
197 protected: | 197 protected: |
198 NetworkPortalDetectorTestImpl* network_portal_detector() { | 198 NetworkPortalDetectorTestImpl* network_portal_detector() { |
199 return network_portal_detector_; | 199 return network_portal_detector_; |
(...skipping 17 matching lines...) Expand all Loading... |
217 | 217 |
218 ASSERT_TRUE(host); | 218 ASSERT_TRUE(host); |
219 OobeUI* oobe = host->GetOobeUI(); | 219 OobeUI* oobe = host->GetOobeUI(); |
220 ASSERT_TRUE(oobe); | 220 ASSERT_TRUE(oobe); |
221 ErrorScreenActor* actor = oobe->GetErrorScreenActor(); | 221 ErrorScreenActor* actor = oobe->GetErrorScreenActor(); |
222 ASSERT_TRUE(actor); | 222 ASSERT_TRUE(actor); |
223 actor->ShowCaptivePortal(); | 223 actor->ShowCaptivePortal(); |
224 } | 224 } |
225 | 225 |
226 } // namespace chromeos | 226 } // namespace chromeos |
OLD | NEW |