dbus/values_util.h: Add functions to append collection type values to message.

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"
 #include "chromeos/dbus/nfc_adapter_client.h"
 #include "dbus/bus.h"
 #include "dbus/message.h"
+#include "dbus/values_util.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
 using chromeos::nfc_client_helpers::DBusObjectMap;
 using chromeos::nfc_client_helpers::ObjectProxyTree;
 
 namespace chromeos {
 
 NfcDeviceClient::Properties::Properties(
     dbus::ObjectProxy* object_proxy,
     const PropertyChangedCallback& callback)
@@ skipping 77 matching lines @@
           "Cannot push data to device with empty arguments.";
       LOG(ERROR) << error_message;
       error_callback.Run(nfc_error::kInvalidArguments, error_message);
       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 (base::DictionaryValue::Iterator iter(attributes);
-         !iter.IsAtEnd(); iter.Advance()) {
-      array_writer.OpenDictEntry(&dict_entry_writer);
-      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);
+    dbus::AppendValueData(&writer, attributes);
 
     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));
   }
 
  protected:
   // DBusClient override.
@@ skipping 108 matching lines @@
 }
 
 NfcDeviceClient::~NfcDeviceClient() {
 }
 
 NfcDeviceClient* NfcDeviceClient::Create(NfcAdapterClient* adapter_client) {
   return new NfcDeviceClientImpl(adapter_client);
 }
 
 }  // namespace chromeos