Use Name not SSID in CopyIdentifyingProperties

chromeos/network/network_connection_handler.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chromeos/network/network_connection_handler.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/json/json_reader.h"
 #include "chromeos/chromeos_switches.h"
@@ skipping 436 matching lines @@
       client_cert::SetShillProperties(client_cert_type,
                                       cert_loader_->tpm_token_slot(),
                                       cert_loader_->tpm_user_pin(),
                                       pkcs11_id.empty() ? NULL : &pkcs11_id,
                                       &config_properties);
     }
   }
 
   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
   // 'Connectable' is false. If |check_error_state| is true, signal an
   // error, otherwise attempt to connect to possibly gain additional error
   // state from Shill (or in case 'Connectable' is improperly unset).
   if (check_error_state)
     ErrorCallbackForPendingRequest(service_path, kErrorConfigurationRequired);
   else
     CallShillConnect(service_path);
@@ skipping 168 matching lines @@
 
 void NetworkConnectionHandler::HandleShillDisconnectSuccess(
     const std::string& service_path,
     const base::Closure& success_callback) {
   NET_LOG_EVENT("Disconnect Request Sent", service_path);
   if (!success_callback.is_null())
     success_callback.Run();
 }
 
 }  // namespace chromeos