Fix BLE register Dbus interactions.

chromeos/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 "chromeos/dbus/bluetooth_le_advertisement_service_provider.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "base/stl_util.h"
@@ skipping 240 matching lines @@
     dbus::MessageWriter writer(response.get());
     dbus::MessageWriter variant_writer(NULL);
 
     writer.OpenVariant("ay", &variant_writer);
     variant_writer.AppendArrayOfBytes(value.data(), value.size());
     writer.CloseContainer(&variant_writer);
 
     response_sender.Run(response.Pass());
   }
 
+  void AppendArrayVariantOfStrings(dbus::MessageWriter* dict_writer,
+                                   const UUIDList& strings) {
+    dbus::MessageWriter strings_array_variant(nullptr);
+    dict_writer->OpenVariant("as", &strings_array_variant);
+    strings_array_variant.AppendArrayOfStrings(strings);
+    dict_writer->CloseContainer(&strings_array_variant);
+  }
+
   void AppendType(dbus::MessageWriter* array_writer) {
     dbus::MessageWriter dict_entry_writer(NULL);
     array_writer->OpenDictEntry(&dict_entry_writer);
     dict_entry_writer.AppendString(bluetooth_advertisement::kTypeProperty);
     if (type_ == ADVERTISEMENT_TYPE_BROADCAST) {
-      dict_entry_writer.AppendString("broadcast");
+      dict_entry_writer.AppendVariantOfString("broadcast");
     } else {
-      dict_entry_writer.AppendString("peripheral");
+      dict_entry_writer.AppendVariantOfString("peripheral");
     }
     array_writer->CloseContainer(&dict_entry_writer);
   }
 
   void AppendServiceUUIDs(dbus::MessageWriter* array_writer) {
+    if (!service_uuids_)
+      return;
     dbus::MessageWriter dict_entry_writer(NULL);
     array_writer->OpenDictEntry(&dict_entry_writer);
     dict_entry_writer.AppendString(
         bluetooth_advertisement::kServiceUUIDsProperty);
-    dict_entry_writer.AppendArrayOfStrings(*service_uuids_);
+    AppendArrayVariantOfStrings(&dict_entry_writer, *service_uuids_);
     array_writer->CloseContainer(&dict_entry_writer);
   }
 
   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);
     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);
-    dict_entry_writer.AppendArrayOfStrings(*solicit_uuids_);
+    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);
     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);
     for (const auto& m : *manufacturer_data_) {
       dbus::MessageWriter entry_writer(NULL);
 
       array_writer.OpenDictEntry(&entry_writer);
 
       entry_writer.AppendUint32(m.first);
       entry_writer.AppendArrayOfBytes(vector_as_array(&m.second),
                                       m.second.size());
 
       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);
     for (const auto& m : *service_data_) {
       dbus::MessageWriter entry_writer(NULL);
 
       array_writer.OpenDictEntry(&entry_writer);
 
-      entry_writer.AppendString(m.first);
+      entry_writer.AppendVariantOfString(m.first);
       entry_writer.AppendArrayOfBytes(vector_as_array(&m.second),
                                       m.second.size());
 
       array_writer.CloseContainer(&entry_writer);
     }
     writer->CloseContainer(&array_writer);
   }
 
   // Origin thread (i.e. the UI thread in production).
   base::PlatformThreadId origin_thread_id_;
@@ skipping 50 matching lines @@
     return make_scoped_ptr(new BluetoothAdvertisementServiceProviderImpl(
         bus, object_path, delegate, type, service_uuids.Pass(),
         manufacturer_data.Pass(), solicit_uuids.Pass(), service_data.Pass()));
   } else {
     return make_scoped_ptr(
         new FakeBluetoothLEAdvertisementServiceProvider(object_path, delegate));
   }
 }
 
 }  // namespace chromeos