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/chromeos/login/users/user.h" | 10 #include "chrome/browser/chromeos/login/users/user.h" |
(...skipping 246 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
257 service_test_ = dbus_manager->GetShillServiceClient()->GetTestInterface(); | 257 service_test_ = dbus_manager->GetShillServiceClient()->GetTestInterface(); |
258 device_test_ = dbus_manager->GetShillDeviceClient()->GetTestInterface(); | 258 device_test_ = dbus_manager->GetShillDeviceClient()->GetTestInterface(); |
259 | 259 |
260 ShillIPConfigClient::TestInterface* ip_config_test = | 260 ShillIPConfigClient::TestInterface* ip_config_test = |
261 dbus_manager->GetShillIPConfigClient()->GetTestInterface(); | 261 dbus_manager->GetShillIPConfigClient()->GetTestInterface(); |
262 ShillProfileClient::TestInterface* profile_test = | 262 ShillProfileClient::TestInterface* profile_test = |
263 dbus_manager->GetShillProfileClient()->GetTestInterface(); | 263 dbus_manager->GetShillProfileClient()->GetTestInterface(); |
264 | 264 |
265 device_test_->ClearDevices(); | 265 device_test_->ClearDevices(); |
266 service_test_->ClearServices(); | 266 service_test_->ClearServices(); |
| 267 profile_test->ClearProfiles(); |
267 | 268 |
268 // Sends a notification about the added profile. | 269 // Sends a notification about the added profile. |
269 profile_test->AddProfile(kUser1ProfilePath, userhash_); | 270 profile_test->AddProfile(kUser1ProfilePath, userhash_); |
270 | 271 |
271 // Add IPConfigs | 272 // Add IPConfigs |
272 base::DictionaryValue ipconfig; | 273 base::DictionaryValue ipconfig; |
273 ipconfig.SetStringWithoutPathExpansion(shill::kAddressProperty, "0.0.0.0"); | 274 ipconfig.SetStringWithoutPathExpansion(shill::kAddressProperty, "0.0.0.0"); |
274 ipconfig.SetStringWithoutPathExpansion(shill::kGatewayProperty, "0.0.0.1"); | 275 ipconfig.SetStringWithoutPathExpansion(shill::kGatewayProperty, "0.0.0.1"); |
275 ipconfig.SetIntegerWithoutPathExpansion(shill::kPrefixlenProperty, 0); | 276 ipconfig.SetIntegerWithoutPathExpansion(shill::kPrefixlenProperty, 0); |
276 ipconfig.SetStringWithoutPathExpansion(shill::kMethodProperty, | 277 ipconfig.SetStringWithoutPathExpansion(shill::kMethodProperty, |
(...skipping 340 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
617 | 618 |
618 TestListener listener( | 619 TestListener listener( |
619 "notifyPortalDetectorObservers", | 620 "notifyPortalDetectorObservers", |
620 base::Bind(&NetworkPortalDetectorTestImpl::NotifyObserversForTesting, | 621 base::Bind(&NetworkPortalDetectorTestImpl::NotifyObserversForTesting, |
621 base::Unretained(detector()))); | 622 base::Unretained(detector()))); |
622 EXPECT_TRUE(RunNetworkingSubtest("captivePortalNotification")) << message_; | 623 EXPECT_TRUE(RunNetworkingSubtest("captivePortalNotification")) << message_; |
623 } | 624 } |
624 #endif // defined(OS_CHROMEOS) | 625 #endif // defined(OS_CHROMEOS) |
625 | 626 |
626 } // namespace | 627 } // namespace |
OLD | NEW |