Use Name not SSID in CopyIdentifyingProperties

This also makes a minor change to WifiConfigView to update the 'Connect'
button enabled state after receiving wifi properties by calling
UpdateDialogButtons().

BUG=289642
R=pneubeck@chromium.org

Review URL: https://codereview.chromium.org/23872021

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@223435 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/chromeos/options/wifi_config_view.cc

@@ -1249,6 +1249,9 @@ void WifiConfigView::InitFromProperties(
       if (cert_index >= 0) {
         // Skip item for "Default".
         server_ca_cert_combobox_->SetSelectedIndex(1 + cert_index);
+      } else {
+        // "Default"
+        server_ca_cert_combobox_->SetSelectedIndex(0);
       }
     }
   }
@@ -1292,6 +1295,7 @@ void WifiConfigView::InitFromProperties(
       flimflam::kSaveCredentialsProperty, &save_credentials);
   save_credentials_checkbox_->SetChecked(save_credentials);
 
+  UpdateDialogButtons();
   RefreshShareCheckbox();
   UpdateErrorLabel();
 }

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