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

chromeos/dbus/nfc_client_helpers.h

 // 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.
 
 #ifndef CHROMEOS_DBUS_NFC_CLIENT_HELPERS_H_
 #define CHROMEOS_DBUS_NFC_CLIENT_HELPERS_H_
 
 #include <map>
 #include <string>
 #include <utility>
 
 #include "base/basictypes.h"
 #include "base/callback.h"
+#include "base/values.h"
 #include "chromeos/chromeos_export.h"
 #include "chromeos/dbus/nfc_property_set.h"
 #include "dbus/bus.h"
 #include "dbus/message.h"
 #include "dbus/object_path.h"
 #include "dbus/object_proxy.h"
 
 namespace chromeos {
 namespace nfc_client_helpers {
 
@@ skipping 13 matching lines @@
 
 // Called when a response for a successful method call is received.
 CHROMEOS_EXPORT void OnSuccess(const base::Closure& callback,
                                dbus::Response* response);
 
 // Extracts the error data from |response| and invokes |error_callback| with
 // the resulting error name and error message.
 CHROMEOS_EXPORT void OnError(const ErrorCallback& error_callback,
                              dbus::ErrorResponse* response);
 
+// Appends any value (basic types and nested types) represented by |value| to
+// the writer |writer| as a variant type.
+// TODO(armansito): Consider moving this to dbus/values_util.h"
+CHROMEOS_EXPORT void AppendValueDataAsVariant(dbus::MessageWriter* writer,
+                                              const base::Value& value);
+
 // DBusObjectMap is a simple data structure that facilitates keeping track of
 // D-Bus object proxies and properties. It maintains a mapping from object
 // paths to object proxy - property structure pairs.
 // TODO(armansito): This is only needed until neard implements the D-Bus
 // org.freedesktop.DBus.ObjectManager interface. Remove this once we upgrade
 // to neard-0.14.
 class CHROMEOS_EXPORT DBusObjectMap {
  public:
   // DBusObjectMap::Delegate must be implemented by classes that use an
   // instance of DBusObjectMap to manage object proxies.
@@ skipping 135 matching lines @@
   typedef std::map<dbus::ObjectPath, DBusObjectMap*> PathsToObjectMapsType;
   PathsToObjectMapsType paths_to_object_maps_;
 
   DISALLOW_COPY_AND_ASSIGN(ObjectProxyTree);
 };
 
 }  // namespace nfc_client_helpers
 }  // namespace chromeos
 
 #endif  // CHROMEOS_DBUS_NFC_CLIENT_HELPERS_H_