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 337041b9e489b511827dbd9e8bce3648f02dcdef..e66c178c11bae7a8306b103df2d0b9bce451928b 100644 |
| --- a/chromeos/dbus/fake_shill_manager_client.cc |
| +++ b/chromeos/dbus/fake_shill_manager_client.cc |
| @@ -1115,8 +1115,9 @@ bool FakeShillManagerClient::ParseOption(const std::string& arg0, |
| return SetInitialNetworkState(arg0, arg1); |
| } |
| -bool FakeShillManagerClient::SetInitialNetworkState(std::string type_arg, |
| - std::string state_arg) { |
| +bool FakeShillManagerClient::SetInitialNetworkState( |
| + const std::string& type_arg, |
| + const std::string& state_arg) { |
| int state_arg_as_int = -1; |
| base::StringToInt(state_arg, &state_arg_as_int); |
| @@ -1166,11 +1167,9 @@ bool FakeShillManagerClient::SetInitialNetworkState(std::string type_arg, |
| shill_initial_state_map_[shill::kTypeCellular] = state; |
| return true; |
| } |
| - // Convenience synonyms. |
| - if (type_arg == "eth") |
| - type_arg = shill::kTypeEthernet; |
| if (type_arg != shill::kTypeEthernet && |
| + type_arg != "eth" && // synonym for KTypeEthernet |
|
Daniel Erat
2015/09/21 21:47:05
this is different behavior than what was there bef
ki.stfu
2015/09/21 22:20:40
Done.
|
| type_arg != shill::kTypeWifi && |
| type_arg != shill::kTypeCellular && |
| type_arg != shill::kTypeWimax && |