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 "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/location.h" | 7 #include "base/location.h" |
8 #include "base/macros.h" | 8 #include "base/macros.h" |
9 #include "base/run_loop.h" | 9 #include "base/run_loop.h" |
10 #include "base/single_thread_task_runner.h" | 10 #include "base/single_thread_task_runner.h" |
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
119 ShillServiceClient::TestInterface* service_test = | 119 ShillServiceClient::TestInterface* service_test = |
120 DBusThreadManager::Get()->GetShillServiceClient()->GetTestInterface(); | 120 DBusThreadManager::Get()->GetShillServiceClient()->GetTestInterface(); |
121 service_test->ClearServices(); | 121 service_test->ClearServices(); |
122 service_test->AddService(kWifiServicePath, | 122 service_test->AddService(kWifiServicePath, |
123 kWifiGuid, | 123 kWifiGuid, |
124 "wifi", | 124 "wifi", |
125 shill::kTypeEthernet, | 125 shill::kTypeEthernet, |
126 shill::kStateIdle, | 126 shill::kStateIdle, |
127 true /* add_to_visible */); | 127 true /* add_to_visible */); |
128 DBusThreadManager::Get()->GetShillServiceClient()->SetProperty( | 128 DBusThreadManager::Get()->GetShillServiceClient()->SetProperty( |
129 dbus::ObjectPath(kWifiServicePath), | 129 dbus::ObjectPath(kWifiServicePath), shill::kStateProperty, |
130 shill::kStateProperty, | 130 base::Value(shill::kStatePortal), base::Bind(&base::DoNothing), |
131 base::StringValue(shill::kStatePortal), | |
132 base::Bind(&base::DoNothing), | |
133 base::Bind(&ErrorCallbackFunction)); | 131 base::Bind(&ErrorCallbackFunction)); |
134 | 132 |
135 network_portal_detector_ = new NetworkPortalDetectorImpl( | 133 network_portal_detector_ = new NetworkPortalDetectorImpl( |
136 g_browser_process->system_request_context(), | 134 g_browser_process->system_request_context(), |
137 true /* create_notification_controller */); | 135 true /* create_notification_controller */); |
138 network_portal_detector::InitializeForTesting(network_portal_detector_); | 136 network_portal_detector::InitializeForTesting(network_portal_detector_); |
139 network_portal_detector_->Enable(false /* start_detection */); | 137 network_portal_detector_->Enable(false /* start_detection */); |
140 set_detector(network_portal_detector_->captive_portal_detector_.get()); | 138 set_detector(network_portal_detector_->captive_portal_detector_.get()); |
141 PortalDetectorStrategy::set_delay_till_next_attempt_for_testing( | 139 PortalDetectorStrategy::set_delay_till_next_attempt_for_testing( |
142 base::TimeDelta()); | 140 base::TimeDelta()); |
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
302 IN_PROC_BROWSER_TEST_P(NetworkPortalDetectorImplBrowserTestIgnoreProxy, | 300 IN_PROC_BROWSER_TEST_P(NetworkPortalDetectorImplBrowserTestIgnoreProxy, |
303 TestWithPreference) { | 301 TestWithPreference) { |
304 TestImpl(GetParam()); | 302 TestImpl(GetParam()); |
305 } | 303 } |
306 | 304 |
307 INSTANTIATE_TEST_CASE_P(CaptivePortalAuthenticationIgnoresProxy, | 305 INSTANTIATE_TEST_CASE_P(CaptivePortalAuthenticationIgnoresProxy, |
308 NetworkPortalDetectorImplBrowserTestIgnoreProxy, | 306 NetworkPortalDetectorImplBrowserTestIgnoreProxy, |
309 testing::Bool()); | 307 testing::Bool()); |
310 | 308 |
311 } // namespace chromeos | 309 } // namespace chromeos |
OLD | NEW |