Fix ManufacturerData and ServiceData DBus data type to match with bluez.

device/bluetooth/dbus/bluetooth_le_advertisement_service_provider.cc

 // Copyright 2015 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_le_advertisement_service_provider.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 283 matching lines @@
   }
 
   void AppendManufacturerData(dbus::MessageWriter* array_writer) {
     if (!manufacturer_data_)
       return;
     dbus::MessageWriter dict_entry_writer(NULL);
     array_writer->OpenDictEntry(&dict_entry_writer);
     dict_entry_writer.AppendString(
         bluetooth_advertisement::kManufacturerDataProperty);
     dbus::MessageWriter variant_writer(NULL);
-    dict_entry_writer.OpenVariant("a{qay}", &variant_writer);
+    dict_entry_writer.OpenVariant("a{qv}", &variant_writer);
     AppendManufacturerDataVariant(&variant_writer);
     dict_entry_writer.CloseContainer(&variant_writer);
     array_writer->CloseContainer(&dict_entry_writer);
   }
 
   void AppendSolicitUUIDs(dbus::MessageWriter* array_writer) {
     if (!solicit_uuids_)
       return;
     dbus::MessageWriter dict_entry_writer(NULL);
     array_writer->OpenDictEntry(&dict_entry_writer);
     dict_entry_writer.AppendString(
         bluetooth_advertisement::kSolicitUUIDsProperty);
     AppendArrayVariantOfStrings(&dict_entry_writer, *solicit_uuids_);
     array_writer->CloseContainer(&dict_entry_writer);
   }
 
   void AppendServiceData(dbus::MessageWriter* array_writer) {
     if (!service_data_)
       return;
     dbus::MessageWriter dict_entry_writer(NULL);
     array_writer->OpenDictEntry(&dict_entry_writer);
     dict_entry_writer.AppendString(
         bluetooth_advertisement::kServiceDataProperty);
     dbus::MessageWriter variant_writer(NULL);
-    dict_entry_writer.OpenVariant("a{say}", &variant_writer);
+    dict_entry_writer.OpenVariant("a{sv}", &variant_writer);
     AppendServiceDataVariant(&variant_writer);
     dict_entry_writer.CloseContainer(&variant_writer);
     array_writer->CloseContainer(&dict_entry_writer);
   }
 
   void AppendManufacturerDataVariant(dbus::MessageWriter* writer) {
     DCHECK(manufacturer_data_);
     dbus::MessageWriter array_writer(NULL);
-    writer->OpenArray("{qay}", &array_writer);
+    writer->OpenArray("{qv}", &array_writer);
     for (const auto& m : *manufacturer_data_) {
       dbus::MessageWriter entry_writer(NULL);
 
       array_writer.OpenDictEntry(&entry_writer);
 
-      entry_writer.AppendUint32(m.first);
-      entry_writer.AppendArrayOfBytes(m.second.data(), m.second.size());
+      entry_writer.AppendUint16(m.first);
+      dbus::MessageWriter variant_writer(NULL);
+      entry_writer.OpenVariant("ay", &variant_writer);
+      variant_writer.AppendArrayOfBytes(m.second.data(), m.second.size());
+      entry_writer.CloseContainer(&variant_writer);
 
       array_writer.CloseContainer(&entry_writer);
     }
     writer->CloseContainer(&array_writer);
   }
 
   void AppendServiceDataVariant(dbus::MessageWriter* writer) {
     DCHECK(service_data_);
     dbus::MessageWriter array_writer(NULL);
-    writer->OpenArray("{say}", &array_writer);
+    writer->OpenArray("{sv}", &array_writer);
     for (const auto& m : *service_data_) {
       dbus::MessageWriter entry_writer(NULL);
 
       array_writer.OpenDictEntry(&entry_writer);
 
       entry_writer.AppendString(m.first);
-      entry_writer.AppendArrayOfBytes(m.second.data(), m.second.size());
+      dbus::MessageWriter variant_writer(NULL);
+      entry_writer.OpenVariant("ay", &variant_writer);
+      variant_writer.AppendArrayOfBytes(m.second.data(), m.second.size());
+      entry_writer.CloseContainer(&variant_writer);
 
       array_writer.CloseContainer(&entry_writer);
     }
     writer->CloseContainer(&array_writer);
   }
 
   // Origin thread (i.e. the UI thread in production).
   base::PlatformThreadId origin_thread_id_;
 
   // D-Bus bus object is exported on, not owned by this object and must
@@ skipping 46 matching lines @@
     return base::MakeUnique<BluetoothAdvertisementServiceProviderImpl>(
         bus, object_path, delegate, type, std::move(service_uuids),
         std::move(manufacturer_data), std::move(solicit_uuids),
         std::move(service_data));
   }
   return base::MakeUnique<FakeBluetoothLEAdvertisementServiceProvider>(
       object_path, delegate);
 }
 
 }  // namespace bluez