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

chromeos/dbus/nfc_device_client.cc

 // Copyright 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/dbus/nfc_device_client.h"
 
 #include "base/bind.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "base/strings/stringprintf.h"
@@ skipping 52 matching lines @@
   // NfcDeviceClient override.
   virtual Properties* GetProperties(
       const dbus::ObjectPath& object_path) OVERRIDE {
     return static_cast<Properties*>(
         adapters_to_object_maps_.FindObjectProperties(object_path));
   }
 
   // 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 =
         adapters_to_object_maps_.FindObjectProxy(object_path);
     if (!object_proxy) {
       std::string error_message =
           base::StringPrintf(
               "NFC device with object path \"%s\" does not exist.",
               object_path.value().c_str());
       LOG(ERROR) << error_message;
@@ skipping 11 matching lines @@
       return;
     }
 
     // Create the arguments.
     dbus::MethodCall method_call(nfc_device::kNfcDeviceInterface,
                                  nfc_device::kPush);
     dbus::MessageWriter writer(&method_call);
     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);
 
     object_proxy->CallMethodWithErrorCallback(
         &method_call,
         dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
         base::Bind(&nfc_client_helpers::OnSuccess, callback),
         base::Bind(&nfc_client_helpers::OnError, error_callback));
   }
@@ skipping 115 matching lines @@
 
 NfcDeviceClient* NfcDeviceClient::Create(DBusClientImplementationType type,
                                          NfcAdapterClient* adapter_client) {
   if (type == REAL_DBUS_CLIENT_IMPLEMENTATION)
     return new NfcDeviceClientImpl(adapter_client);
   DCHECK_EQ(STUB_DBUS_CLIENT_IMPLEMENTATION, type);
   return new FakeNfcDeviceClient();
 }
 
 }  // namespace chromeos