Index: chromeos/network/network_connection_handler.cc |
diff --git a/chromeos/network/network_connection_handler.cc b/chromeos/network/network_connection_handler.cc |
index dfcba54c2f219f3bc980787e23475a167308bd80..ac5331c2151fb250bde252e57f010650b594f7e3 100644 |
--- a/chromeos/network/network_connection_handler.cc |
+++ b/chromeos/network/network_connection_handler.cc |
@@ -454,21 +454,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( |
pneubeck (no reviews)
2013/09/14 16:04:25
ha! yes that makes more sense.
|
+ 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 |