Chromium Code Reviews| Index: chromeos/dbus/fake_shill_manager_client.cc |
| diff --git a/chromeos/dbus/fake_shill_manager_client.cc b/chromeos/dbus/fake_shill_manager_client.cc |
| index d0e392fd66a6a852d542d9d20b2704a11084bf57..fa87bdfa93d40c7f8eab8f87b4c0ce93850d7c24 100644 |
| --- a/chromeos/dbus/fake_shill_manager_client.cc |
| +++ b/chromeos/dbus/fake_shill_manager_client.cc |
| @@ -726,27 +726,24 @@ void FakeShillManagerClient::SetupDefaultEnvironment() { |
| } |
| // Wimax |
| + const std::string kWimaxPath = "/service/wimax1"; |
| state = GetInitialStateForType(shill::kTypeWimax, &enabled); |
| if (state != kTechnologyUnavailable) { |
| AddTechnology(shill::kTypeWimax, enabled); |
| devices->AddDevice( |
| "/device/wimax1", shill::kTypeWimax, "stub_wimax_device1"); |
| - services->AddService("/service/wimax1", |
| - "wimax1_guid", |
| - "wimax1" /* name */, |
| - shill::kTypeWimax, |
| - state, |
| - add_to_visible); |
| - services->SetServiceProperty("/service/wimax1", |
| - shill::kConnectableProperty, |
| + services->AddService(kWimaxPath, "wimax1_guid", "wimax1" /* name */, |
| + shill::kTypeWimax, state, add_to_visible); |
| + services->SetServiceProperty(kWimaxPath, shill::kConnectableProperty, |
| base::FundamentalValue(true)); |
| base::FundamentalValue strength_value(80); |
| - services->SetServiceProperty( |
| - "/service/wimax1", shill::kSignalStrengthProperty, strength_value); |
| + services->SetServiceProperty(kWimaxPath, shill::kSignalStrengthProperty, |
| + strength_value); |
| base::StringValue identity_value("test.identity"); |
| - services->SetServiceProperty( |
| - "/service/wimax1", shill::kEapIdentityProperty, identity_value); |
| + services->SetServiceProperty(kWimaxPath, shill::kEapIdentityProperty, |
| + identity_value); |
| + profiles->AddService(shared_profile, kWimaxPath); |
|
pneubeck (no reviews)
2015/02/25 08:47:19
probably not an expected combination: wimax+eap+sh
stevenjb
2015/02/25 18:19:49
Removed the EAP property which isn't really set up
|
| } |
| // Cellular |