Fixes to DBus GATT components.

device/bluetooth/dbus/bluetooth_gatt_service_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_service_service_provider_impl.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
 namespace bluez {
 
 namespace {
 
 const char kErrorInvalidArgs[] = "org.freedesktop.DBus.Error.InvalidArgs";
 const char kErrorPropertyReadOnly[] =
     "org.freedesktop.DBus.Error.PropertyReadOnly";
 
 }  // namespace
 
 BluetoothGattServiceServiceProviderImpl::
     BluetoothGattServiceServiceProviderImpl(
         dbus::Bus* bus,
         const dbus::ObjectPath& object_path,
         const std::string& uuid,
+        bool is_primary,
         const std::vector<dbus::ObjectPath>& includes)
     : origin_thread_id_(base::PlatformThread::CurrentId()),
       uuid_(uuid),
+      is_primary_(is_primary),
       includes_(includes),
       bus_(bus),
       object_path_(object_path),
       weak_ptr_factory_(this) {
   VLOG(1) << "Creating Bluetooth GATT service: " << object_path_.value()
           << " UUID: " << uuid;
   DCHECK(!uuid_.empty());
   DCHECK(object_path_.IsValid());
   DCHECK(bus_);
 
@@ skipping 23 matching lines @@
 
 BluetoothGattServiceServiceProviderImpl::
     ~BluetoothGattServiceServiceProviderImpl() {
   VLOG(1) << "Cleaning up Bluetooth GATT service: " << object_path_.value();
   if (bus_)
     bus_->UnregisterExportedObject(object_path_);
 }
 
 BluetoothGattServiceServiceProviderImpl::
     BluetoothGattServiceServiceProviderImpl(const dbus::ObjectPath& object_path,
-                                            const std::string& uuid)
+                                            const std::string& uuid,
+                                            bool is_primary)
     : origin_thread_id_(base::PlatformThread::CurrentId()),
       uuid_(uuid),
+      is_primary_(is_primary),
       bus_(nullptr),
       object_path_(object_path),
       weak_ptr_factory_(this) {}
 
 bool BluetoothGattServiceServiceProviderImpl::OnOriginThread() {
   return base::PlatformThread::CurrentId() == origin_thread_id_;
 }
 
 void BluetoothGattServiceServiceProviderImpl::Get(
     dbus::MethodCall* method_call,
@@ skipping 113 matching lines @@
   dbus::MessageWriter variant_writer(NULL);
 
   writer->OpenArray("{sv}", &array_writer);
 
   array_writer.OpenDictEntry(&dict_entry_writer);
   dict_entry_writer.AppendString(bluetooth_gatt_service::kUUIDProperty);
   dict_entry_writer.AppendVariantOfString(uuid_);
   array_writer.CloseContainer(&dict_entry_writer);
 
   array_writer.OpenDictEntry(&dict_entry_writer);
+  dict_entry_writer.AppendString(bluetooth_gatt_service::kPrimaryProperty);
+  dict_entry_writer.AppendVariantOfBool(is_primary_);
+  array_writer.CloseContainer(&dict_entry_writer);
+
+  array_writer.OpenDictEntry(&dict_entry_writer);
   dict_entry_writer.AppendString(bluetooth_gatt_service::kIncludesProperty);
   dict_entry_writer.OpenVariant("ao", &variant_writer);
   variant_writer.AppendArrayOfObjectPaths(includes_);
   dict_entry_writer.CloseContainer(&variant_writer);
   array_writer.CloseContainer(&dict_entry_writer);
 
   writer->CloseContainer(&array_writer);
 }
 
 void BluetoothGattServiceServiceProviderImpl::OnExported(
     const std::string& interface_name,
     const std::string& method_name,
     bool success) {
   LOG_IF(WARNING, !success) << "Failed to export " << interface_name << "."
                             << method_name;
 }
 
 const dbus::ObjectPath& BluetoothGattServiceServiceProviderImpl::object_path()
     const {
   return object_path_;
 }
 
 }  // namespace bluez