nfc: Various fixes to the NFC D-Bus client in chromeos/dbus.

chromeos/dbus/nfc_device_client.cc

Index: chromeos/dbus/nfc_device_client.cc
diff --git a/chromeos/dbus/nfc_device_client.cc b/chromeos/dbus/nfc_device_client.cc
index 94d4099668323695e9d47370a71c0ef9903adc6d..7d0248793b7f38ff931cbd994a8b573959d4e3ab 100644
--- a/chromeos/dbus/nfc_device_client.cc
+++ b/chromeos/dbus/nfc_device_client.cc
@@ -70,7 +70,7 @@ class NfcDeviceClientImpl : public NfcDeviceClient,
   // NfcDeviceClient override.
   virtual void Push(
       const dbus::ObjectPath& object_path,
-      const NfcRecordClient::Attributes& attributes,
+      const base::DictionaryValue& attributes,
       const base::Closure& callback,
       const nfc_client_helpers::ErrorCallback& error_callback) OVERRIDE {
     dbus::ObjectProxy* object_proxy =
@@ -102,11 +102,12 @@ class NfcDeviceClientImpl : public NfcDeviceClient,
     dbus::MessageWriter array_writer(NULL);
     dbus::MessageWriter dict_entry_writer(NULL);
     writer.OpenArray("{sv}", &array_writer);
-    for (NfcRecordClient::Attributes::const_iterator iter = attributes.begin();
-         iter != attributes.end(); ++iter) {
+    for (DictionaryValue::Iterator iter(attributes);
+         !iter.IsAtEnd(); iter.Advance()) {
       array_writer.OpenDictEntry(&dict_entry_writer);
-      dict_entry_writer.AppendString(iter->first);
-      dict_entry_writer.AppendVariantOfString(iter->second);
+      dict_entry_writer.AppendString(iter.key());
+      nfc_client_helpers::AppendValueDataAsVariant(&dict_entry_writer,
+                                                   iter.value());
       array_writer.CloseContainer(&dict_entry_writer);
     }
     writer.CloseContainer(&array_writer);