| 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/test/oobe_base_test.h" | 5 #include "chrome/browser/chromeos/login/test/oobe_base_test.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/message_loop/message_loop.h" | 8 #include "base/message_loop/message_loop.h" |
| 9 #include "base/path_service.h" | 9 #include "base/path_service.h" |
| 10 #include "chrome/browser/chrome_notification_types.h" | 10 #include "chrome/browser/chrome_notification_types.h" |
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 57 embedded_test_server()->StopThread(); | 57 embedded_test_server()->StopThread(); |
| 58 | 58 |
| 59 ExtensionApiTest::SetUp(); | 59 ExtensionApiTest::SetUp(); |
| 60 } | 60 } |
| 61 | 61 |
| 62 void OobeBaseTest::SetUpInProcessBrowserTestFixture() { | 62 void OobeBaseTest::SetUpInProcessBrowserTestFixture() { |
| 63 host_resolver()->AddRule("*", "127.0.0.1"); | 63 host_resolver()->AddRule("*", "127.0.0.1"); |
| 64 network_portal_detector_ = new NetworkPortalDetectorTestImpl(); | 64 network_portal_detector_ = new NetworkPortalDetectorTestImpl(); |
| 65 NetworkPortalDetector::InitializeForTesting(network_portal_detector_); | 65 NetworkPortalDetector::InitializeForTesting(network_portal_detector_); |
| 66 network_portal_detector_->SetDefaultNetworkPathForTesting( | 66 network_portal_detector_->SetDefaultNetworkPathForTesting( |
| 67 kStubEthernetServicePath, |
| 67 kStubEthernetServicePath); | 68 kStubEthernetServicePath); |
| 68 | 69 |
| 69 ExtensionApiTest::SetUpInProcessBrowserTestFixture(); | 70 ExtensionApiTest::SetUpInProcessBrowserTestFixture(); |
| 70 } | 71 } |
| 71 | 72 |
| 72 void OobeBaseTest::SetUpOnMainThread() { | 73 void OobeBaseTest::SetUpOnMainThread() { |
| 73 // Restart the thread as the sandbox host process has already been spawned. | 74 // Restart the thread as the sandbox host process has already been spawned. |
| 74 embedded_test_server()->RestartThreadAndListen(); | 75 embedded_test_server()->RestartThreadAndListen(); |
| 75 | 76 |
| 76 ExtensionApiTest::SetUpOnMainThread(); | 77 ExtensionApiTest::SetUpOnMainThread(); |
| (...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 174 | 175 |
| 175 WebUILoginDisplay* OobeBaseTest::GetLoginDisplay() { | 176 WebUILoginDisplay* OobeBaseTest::GetLoginDisplay() { |
| 176 ExistingUserController* controller = | 177 ExistingUserController* controller = |
| 177 ExistingUserController::current_controller(); | 178 ExistingUserController::current_controller(); |
| 178 CHECK(controller); | 179 CHECK(controller); |
| 179 return static_cast<WebUILoginDisplay*>( | 180 return static_cast<WebUILoginDisplay*>( |
| 180 controller->login_display()); | 181 controller->login_display()); |
| 181 } | 182 } |
| 182 | 183 |
| 183 } // namespace chromeos | 184 } // namespace chromeos |
| OLD | NEW |