| Index: chromeos/network/network_connection_handler.cc
|
| diff --git a/chromeos/network/network_connection_handler.cc b/chromeos/network/network_connection_handler.cc
|
| index 3821c8bae17ccce0ded86fad445f70e804dbb1f5..f5f081fa1fdcb1d942435608e329f22c7be3b207 100644
|
| --- a/chromeos/network/network_connection_handler.cc
|
| +++ b/chromeos/network/network_connection_handler.cc
|
| @@ -452,21 +452,16 @@ void NetworkConnectionHandler::VerifyConfiguredAndConnect(
|
|
|
| if (!config_properties.empty()) {
|
| NET_LOG_EVENT("Configuring Network", service_path);
|
| - if (shill_property_util::CopyIdentifyingProperties(service_properties,
|
| - &config_properties)) {
|
| - network_configuration_handler_->SetProperties(
|
| - service_path,
|
| - config_properties,
|
| - base::Bind(&NetworkConnectionHandler::CallShillConnect,
|
| - AsWeakPtr(),
|
| - service_path),
|
| - base::Bind(&NetworkConnectionHandler::HandleConfigurationFailure,
|
| - AsWeakPtr(),
|
| - service_path));
|
| - return;
|
| - }
|
| - NET_LOG_ERROR("Shill dictionary is missing some relevant entries",
|
| - service_path);
|
| + network_configuration_handler_->SetProperties(
|
| + service_path,
|
| + config_properties,
|
| + base::Bind(&NetworkConnectionHandler::CallShillConnect,
|
| + AsWeakPtr(),
|
| + service_path),
|
| + base::Bind(&NetworkConnectionHandler::HandleConfigurationFailure,
|
| + AsWeakPtr(),
|
| + service_path));
|
| + return;
|
| }
|
|
|
| // Otherwise, we probably still need to configure the network since
|
|
|