device/bluetooth: Fix DBus message construction of CreateServiceRecord method

device/bluetooth/dbus/bluetooth_adapter_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 "device/bluetooth/dbus/bluetooth_adapter_client.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/logging.h"
 #include "base/memory/weak_ptr.h"
@@ skipping 15 matching lines @@
 void WriteAttribute(dbus::MessageWriter* writer,
                     const BluetoothServiceAttributeValueBlueZ& attribute) {
   dbus::MessageWriter struct_writer(nullptr);
   writer->OpenStruct(&struct_writer);
   struct_writer.AppendByte(attribute.type());
   struct_writer.AppendUint32(attribute.size());
 
   if (attribute.type() != BluetoothServiceAttributeValueBlueZ::SEQUENCE) {
     dbus::AppendValueDataAsVariant(&struct_writer, attribute.value());
   } else {
+    dbus::MessageWriter variant_writer(nullptr);
     dbus::MessageWriter array_writer(nullptr);
-    struct_writer.OpenArray("v", &array_writer);
+    struct_writer.OpenVariant("a(yuv)", &variant_writer);
+    variant_writer.OpenArray("(yuv)", &array_writer);
+
     for (const auto& v : attribute.sequence())
       WriteAttribute(&array_writer, v);
-    struct_writer.CloseContainer(&array_writer);
+    variant_writer.CloseContainer(&array_writer);
+    struct_writer.CloseContainer(&variant_writer);
   }
   writer->CloseContainer(&struct_writer);
 }
-}
+
+}  // namespace
 
 BluetoothAdapterClient::DiscoveryFilter::DiscoveryFilter() {}
 
 BluetoothAdapterClient::DiscoveryFilter::~DiscoveryFilter() {}
 
 void BluetoothAdapterClient::DiscoveryFilter::CopyFrom(
     const DiscoveryFilter& filter) {
   if (filter.rssi.get())
     rssi.reset(new int16_t(*filter.rssi));
   else
@@ skipping 242 matching lines @@
 
   // BluetoothAdapterClient override.
   void CreateServiceRecord(const dbus::ObjectPath& object_path,
                            const bluez::BluetoothServiceRecordBlueZ& record,
                            const ServiceRecordCallback& callback,
                            const ErrorCallback& error_callback) override {
     dbus::MethodCall method_call(bluetooth_adapter::kBluetoothAdapterInterface,
                                  bluetooth_adapter::kCreateServiceRecord);
 
     dbus::MessageWriter writer(&method_call);
+    dbus::MessageWriter array_writer(&method_call);
     dbus::MessageWriter dict_entry_writer(nullptr);
+    writer.OpenArray("{q(yuv)}", &array_writer);
     for (auto attribute_id : record.GetAttributeIds()) {
-      writer.OpenDictEntry(&dict_entry_writer);
+      array_writer.OpenDictEntry(&dict_entry_writer);
       dict_entry_writer.AppendUint16(attribute_id);
       const BluetoothServiceAttributeValueBlueZ& attribute_value =
           record.GetAttributeValue(attribute_id);
       WriteAttribute(&dict_entry_writer, attribute_value);
+      array_writer.CloseContainer(&dict_entry_writer);
     }
+    writer.CloseContainer(&array_writer);
 
     dbus::ObjectProxy* object_proxy =
         object_manager_->GetObjectProxy(object_path);
     if (!object_proxy) {
       error_callback.Run(kUnknownAdapterError, "");
       return;
     }
 
     object_proxy->CallMethodWithErrorCallback(
         &method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
@@ skipping 114 matching lines @@
 
 BluetoothAdapterClient::BluetoothAdapterClient() {}
 
 BluetoothAdapterClient::~BluetoothAdapterClient() {}
 
 BluetoothAdapterClient* BluetoothAdapterClient::Create() {
   return new BluetoothAdapterClientImpl;
 }
 
 }  // namespace bluez