Implement DBus changes needed for notifications.

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"
 
 namespace bluez {
 
 BluetoothGattApplicationServiceProviderImpl::
     BluetoothGattApplicationServiceProviderImpl(
         dbus::Bus* bus,
         const dbus::ObjectPath& object_path,
         const std::map<dbus::ObjectPath, BluetoothLocalGattServiceBlueZ*>&
             services)
     : origin_thread_id_(base::PlatformThread::CurrentId()),
       bus_(bus),
       object_path_(object_path),
       weak_ptr_factory_(this) {
   VLOG(1) << "Creating Bluetooth GATT application: " << object_path_.value();
   DCHECK(object_path_.IsValid());
-  DCHECK(bus_);
+  if (!bus_)
+    return;
 
   exported_object_ = bus_->GetExportedObject(object_path_);
 
   exported_object_->ExportMethod(
       dbus::kDBusObjectManagerInterface,
       dbus::kDBusObjectManagerGetManagedObjects,
       base::Bind(
           &BluetoothGattApplicationServiceProviderImpl::GetManagedObjects,
           weak_ptr_factory_.GetWeakPtr()),
       base::Bind(&BluetoothGattApplicationServiceProviderImpl::OnExported,
                  weak_ptr_factory_.GetWeakPtr()));
 
-  BluetoothGattApplicationServiceProvider::CreateAttributeServiceProviders(
-      bus, services, &service_providers_, &characteristic_providers_,
-      &descriptor_providers_);
+  CreateAttributeServiceProviders(bus, services);
 }
 
 BluetoothGattApplicationServiceProviderImpl::
     ~BluetoothGattApplicationServiceProviderImpl() {
   VLOG(1) << "Cleaning up Bluetooth GATT service: " << object_path_.value();
   if (bus_)
     bus_->UnregisterExportedObject(object_path_);
 }
 
-BluetoothGattApplicationServiceProviderImpl::
-    BluetoothGattApplicationServiceProviderImpl(
-        const dbus::ObjectPath& object_path)
-    : origin_thread_id_(base::PlatformThread::CurrentId()),
-      bus_(nullptr),
-      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::WriteObjectDict(
     dbus::MessageWriter* writer,
     const std::string& attribute_interface,
     AttributeProvider* attribute_provider) {
   // Open a dict entry for { object_path : interface_list }.
@@ skipping 94 matching lines @@
 // 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