Fixes to DBus GATT components.

device/bluetooth/dbus/bluetooth_gatt_application_service_provider_impl.cc

 // Copyright 2016 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 "device/bluetooth/dbus/bluetooth_gatt_application_service_provider_impl.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
@@ skipping 44 matching lines @@
       object_path_(object_path),
       weak_ptr_factory_(this) {
   VLOG(1) << "Creating Fake Bluetooth GATT application service provider.";
 }
 
 bool BluetoothGattApplicationServiceProviderImpl::OnOriginThread() {
   return base::PlatformThread::CurrentId() == origin_thread_id_;
 }
 
 template <typename AttributeProvider>
-void BluetoothGattApplicationServiceProviderImpl::WriteObjectStruct(
+void BluetoothGattApplicationServiceProviderImpl::WriteObjectDict(
     dbus::MessageWriter* writer,
     const std::string& attribute_interface,
     AttributeProvider* attribute_provider) {
-  // Open a struct entry for { object_path : interface_list }.
-  dbus::MessageWriter object_struct_writer(NULL);
-  // [ (oa(sa{sv}) ]
-  writer->OpenStruct(&object_struct_writer);
+  // Open a dict entry for { object_path : interface_list }.
+  dbus::MessageWriter object_dict_writer(NULL);
+  // [ {oa{sa{sv}} ]
+  writer->OpenDictEntry(&object_dict_writer);
 
-  // Key: Object path. [ (o ]
-  object_struct_writer.AppendObjectPath(attribute_provider->object_path());
+  // Key: Object path. [ {o ]
+  object_dict_writer.AppendObjectPath(attribute_provider->object_path());
 
-  // Value: Open array for single entry interface_list. [ a(sa{sv}) ]
+  // Value: Open array for single entry interface_list. [ a{sa{sv}} ]
   dbus::MessageWriter interface_array_writer(NULL);
-  object_struct_writer.OpenArray("(sa{sv})", &interface_array_writer);
-  WriteInterfaceStruct(&interface_array_writer, attribute_interface,
-                       attribute_provider);
-  object_struct_writer.CloseContainer(&interface_array_writer);
+  object_dict_writer.OpenArray("(sa{sv})", &interface_array_writer);
+  WriteInterfaceDict(&interface_array_writer, attribute_interface,
+                     attribute_provider);
+  object_dict_writer.CloseContainer(&interface_array_writer);
 
-  writer->CloseContainer(&object_struct_writer);
+  writer->CloseContainer(&object_dict_writer);
 }
 
 template <typename AttributeProvider>
-void BluetoothGattApplicationServiceProviderImpl::WriteInterfaceStruct(
+void BluetoothGattApplicationServiceProviderImpl::WriteInterfaceDict(
     dbus::MessageWriter* writer,
     const std::string& attribute_interface,
     AttributeProvider* attribute_provider) {
-  // Open a struct entry for { interface_name : properties_list }.
-  dbus::MessageWriter interface_struct_writer(NULL);
-  // [ (sa{sv}) ]
-  writer->OpenStruct(&interface_struct_writer);
+  // Open a dict entry for { interface_name : properties_list }.
+  dbus::MessageWriter interface_dict_writer(NULL);
+  // [ {sa{sv}} ]
+  writer->OpenDictEntry(&interface_dict_writer);
 
-  // Key: Interface name. [ (s ]
-  interface_struct_writer.AppendString(attribute_interface);
-  // Value: Open a array for properties_list. [ a{sv}) ]
-  WriteAttributeProperties(&interface_struct_writer, attribute_provider);
-  writer->CloseContainer(&interface_struct_writer);
+  // Key: Interface name. [ {s ]
+  interface_dict_writer.AppendString(attribute_interface);
+  // Value: Open a array for properties_list. [ a{sv}} ]
+  WriteAttributeProperties(&interface_dict_writer, attribute_provider);
+  writer->CloseContainer(&interface_dict_writer);
 }
 
 void BluetoothGattApplicationServiceProviderImpl::WriteAttributeProperties(
     dbus::MessageWriter* writer,
     BluetoothGattServiceServiceProvider* service_provider) {
   service_provider->WriteProperties(writer);
 }
 
 void BluetoothGattApplicationServiceProviderImpl::WriteAttributeProperties(
     dbus::MessageWriter* writer,
@@ skipping 12 matching lines @@
     dbus::ExportedObject::ResponseSender response_sender) {
   VLOG(2) << "BluetoothGattApplicationServiceProvider::GetManagedObjects: "
           << object_path_.value();
   DCHECK(OnOriginThread());
 
   dbus::MessageReader reader(method_call);
 
   std::unique_ptr<dbus::Response> response =
       dbus::Response::FromMethodCall(method_call);
 
-  // The expected format by GetAll is [ a(oa(sa{sv})) ]
+  // The expected format by GetAll is [ a{oa{sa{sv}}} ]
   dbus::MessageWriter writer(response.get());
   dbus::MessageWriter array_writer(nullptr);
 
-  writer.OpenArray("(oa(sa{sv}))", &array_writer);
+  writer.OpenArray("{oa{sa{sv}}}", &array_writer);
 
   for (const auto& service_provider : service_providers_) {
-    WriteObjectStruct(&array_writer,
-                      bluetooth_gatt_service::kBluetoothGattServiceInterface,
-                      service_provider.get());
+    WriteObjectDict(&array_writer,
+                    bluetooth_gatt_service::kBluetoothGattServiceInterface,
+                    service_provider.get());
   }
   for (const auto& characteristic_provider : characteristic_providers_) {
-    WriteObjectStruct(
+    WriteObjectDict(
         &array_writer,
         bluetooth_gatt_characteristic::kBluetoothGattCharacteristicInterface,
         characteristic_provider.get());
   }
   for (const auto& descriptor_provider : descriptor_providers_) {
-    WriteObjectStruct(
+    WriteObjectDict(
         &array_writer,
         bluetooth_gatt_descriptor::kBluetoothGattDescriptorInterface,
         descriptor_provider.get());
   }
 
   writer.CloseContainer(&array_writer);
-
   response_sender.Run(std::move(response));
 }
 
 // Called by dbus:: when a method is exported.
 void BluetoothGattApplicationServiceProviderImpl::OnExported(
     const std::string& interface_name,
     const std::string& method_name,
     bool success) {
   LOG_IF(WARNING, !success) << "Failed to export " << interface_name << "."
                             << method_name;
 }
 
 }  // namespace bluez