| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/memory/scoped_ptr.h" | 6 #include "base/memory/scoped_ptr.h" |
| 7 #include "base/prefs/pref_service.h" | 7 #include "base/prefs/pref_service.h" |
| 8 #include "chrome/browser/browser_process.h" | 8 #include "chrome/browser/browser_process.h" |
| 9 #include "chrome/browser/chromeos/login/screens/mock_error_screen.h" | 9 #include "chrome/browser/chromeos/login/screens/mock_error_screen.h" |
| 10 #include "chrome/browser/chromeos/login/screens/mock_screen_observer.h" | 10 #include "chrome/browser/chromeos/login/screens/mock_screen_observer.h" |
| (...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 98 } | 98 } |
| 99 | 99 |
| 100 virtual void TearDownInProcessBrowserTestFixture() OVERRIDE { | 100 virtual void TearDownInProcessBrowserTestFixture() OVERRIDE { |
| 101 NetworkPortalDetector::Shutdown(); | 101 NetworkPortalDetector::Shutdown(); |
| 102 WizardInProcessBrowserTest::TearDownInProcessBrowserTestFixture(); | 102 WizardInProcessBrowserTest::TearDownInProcessBrowserTestFixture(); |
| 103 } | 103 } |
| 104 | 104 |
| 105 void SetDefaultNetworkPath(const std::string& service_path) { | 105 void SetDefaultNetworkPath(const std::string& service_path) { |
| 106 DCHECK(network_portal_detector_); | 106 DCHECK(network_portal_detector_); |
| 107 network_portal_detector_->SetDefaultNetworkPathForTesting( | 107 network_portal_detector_->SetDefaultNetworkPathForTesting( |
| 108 service_path, |
| 108 service_path); | 109 service_path); |
| 109 } | 110 } |
| 110 | 111 |
| 111 void SetDetectionResults( | 112 void SetDetectionResults( |
| 112 const std::string& service_path, | 113 const std::string& service_path, |
| 113 const NetworkPortalDetector::CaptivePortalState& state) { | 114 const NetworkPortalDetector::CaptivePortalState& state) { |
| 114 DCHECK(network_portal_detector_); | 115 DCHECK(network_portal_detector_); |
| 115 network_portal_detector_->SetDetectionResultsForTesting(service_path, | 116 network_portal_detector_->SetDetectionResultsForTesting(service_path, |
| 116 state); | 117 state); |
| 117 } | 118 } |
| (...skipping 280 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 398 chromeos::UpdateEngineClient::UPDATE_RESULT_FAILED); | 399 chromeos::UpdateEngineClient::UPDATE_RESULT_FAILED); |
| 399 EXPECT_CALL(*mock_screen_observer_, | 400 EXPECT_CALL(*mock_screen_observer_, |
| 400 OnExit(ScreenObserver::UPDATE_ERROR_CHECKING_FOR_UPDATE)) | 401 OnExit(ScreenObserver::UPDATE_ERROR_CHECKING_FOR_UPDATE)) |
| 401 .Times(1); | 402 .Times(1); |
| 402 | 403 |
| 403 update_screen_->OnConnectToNetworkRequested(kStubEthernetServicePath); | 404 update_screen_->OnConnectToNetworkRequested(kStubEthernetServicePath); |
| 404 base::MessageLoop::current()->RunUntilIdle(); | 405 base::MessageLoop::current()->RunUntilIdle(); |
| 405 } | 406 } |
| 406 | 407 |
| 407 } // namespace chromeos | 408 } // namespace chromeos |
| OLD | NEW |