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/bind.h" | 5 #include "base/bind.h" |
6 #include "base/callback.h" | 6 #include "base/callback.h" |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/macros.h" | 8 #include "base/macros.h" |
9 #include "chrome/browser/browser_process.h" | 9 #include "chrome/browser/browser_process.h" |
10 #include "chrome/browser/extensions/extension_apitest.h" | 10 #include "chrome/browser/extensions/extension_apitest.h" |
(...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
210 home_provider.SetString("name", "Cellular1_Provider"); | 210 home_provider.SetString("name", "Cellular1_Provider"); |
211 home_provider.SetString("country", "us"); | 211 home_provider.SetString("country", "us"); |
212 device_test_->SetDeviceProperty(kCellularDevicePath, | 212 device_test_->SetDeviceProperty(kCellularDevicePath, |
213 shill::kHomeProviderProperty, | 213 shill::kHomeProviderProperty, |
214 home_provider); | 214 home_provider); |
215 AddService("stub_cellular1", "cellular1", | 215 AddService("stub_cellular1", "cellular1", |
216 shill::kTypeCellular, shill::kStateIdle); | 216 shill::kTypeCellular, shill::kStateIdle); |
217 // Note: These properties will show up in a "Cellular" object in ONC. | 217 // Note: These properties will show up in a "Cellular" object in ONC. |
218 service_test_->SetServiceProperty( | 218 service_test_->SetServiceProperty( |
219 "stub_cellular1", | 219 "stub_cellular1", |
| 220 shill::kAutoConnectProperty, |
| 221 base::FundamentalValue(true)); |
| 222 service_test_->SetServiceProperty( |
| 223 "stub_cellular1", |
220 shill::kNetworkTechnologyProperty, | 224 shill::kNetworkTechnologyProperty, |
221 base::StringValue(shill::kNetworkTechnologyGsm)); | 225 base::StringValue(shill::kNetworkTechnologyGsm)); |
222 service_test_->SetServiceProperty( | 226 service_test_->SetServiceProperty( |
223 "stub_cellular1", | 227 "stub_cellular1", |
224 shill::kActivationStateProperty, | 228 shill::kActivationStateProperty, |
225 base::StringValue(shill::kActivationStateNotActivated)); | 229 base::StringValue(shill::kActivationStateNotActivated)); |
226 service_test_->SetServiceProperty( | 230 service_test_->SetServiceProperty( |
227 "stub_cellular1", | 231 "stub_cellular1", |
228 shill::kRoamingStateProperty, | 232 shill::kRoamingStateProperty, |
229 base::StringValue(shill::kRoamingStateHome)); | 233 base::StringValue(shill::kRoamingStateHome)); |
(...skipping 381 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
611 | 615 |
612 TestListener listener( | 616 TestListener listener( |
613 "notifyPortalDetectorObservers", | 617 "notifyPortalDetectorObservers", |
614 base::Bind(&NetworkPortalDetectorTestImpl::NotifyObserversForTesting, | 618 base::Bind(&NetworkPortalDetectorTestImpl::NotifyObserversForTesting, |
615 base::Unretained(detector()))); | 619 base::Unretained(detector()))); |
616 EXPECT_TRUE(RunNetworkingSubtest("captivePortalNotification")) << message_; | 620 EXPECT_TRUE(RunNetworkingSubtest("captivePortalNotification")) << message_; |
617 } | 621 } |
618 #endif // defined(OS_CHROMEOS) | 622 #endif // defined(OS_CHROMEOS) |
619 | 623 |
620 } // namespace | 624 } // namespace |
OLD | NEW |