Fixes to DBus GATT components.

device/bluetooth/bluez/bluetooth_adapter_bluez.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/bluez/bluetooth_adapter_bluez.h"
 
 #include <memory>
 #include <set>
 #include <string>
 #include <utility>
@@ skipping 1084 matching lines @@
     return;
   }
 
   registered_gatt_services_.erase(service->object_path());
 
   // If we have no GATT services left, unregister our application.
   if (registered_gatt_services_.size() == 0) {
     bluez::BluezDBusManager::Get()
         ->GetBluetoothGattManagerClient()
         ->UnregisterApplication(
-            GetApplicationObjectPath(), callback,
+            object_path_, GetApplicationObjectPath(), callback,
             base::Bind(&OnRegisterationErrorCallback, error_callback));
     return;
   }
 
   // Otherwise, this is tricky (since at the moment, BlueZ does not support
   // adding/removing services individually). We need to update our list of
   // services, then unregister our application, then re-register it with the
   // updated services. TODO(rkc): Fix this once BlueZ is fixed.
   gatt_application_provider_ = BluetoothGattApplicationServiceProvider::Create(
       bluez::BluezDBusManager::Get()->GetSystemBus(), object_path_,
       registered_gatt_services_);
 
   // Unregister our current application. If we are successful, make a call to
   // register the application again with the current set of services.
   bluez::BluezDBusManager::Get()
       ->GetBluetoothGattManagerClient()
       ->UnregisterApplication(
-          GetApplicationObjectPath(),
+          object_path_, GetApplicationObjectPath(),
           base::Bind(&BluetoothAdapterBlueZ::RegisterApplication,
                      weak_ptr_factory_.GetWeakPtr(), callback, error_callback),
           base::Bind(&OnRegisterationErrorCallback, error_callback));
 }
 
 // Returns the object path of the adapter.
 dbus::ObjectPath BluetoothAdapterBlueZ::GetApplicationObjectPath() const {
   return dbus::ObjectPath(object_path_.value() + kGattApplicationObjectPath);
 }
 
@@ skipping 431 matching lines @@
   }
 }
 
 void BluetoothAdapterBlueZ::RegisterApplication(
     const base::Closure& callback,
     const device::BluetoothGattService::ErrorCallback& error_callback) {
   DCHECK(bluez::BluezDBusManager::Get());
   bluez::BluezDBusManager::Get()
       ->GetBluetoothGattManagerClient()
       ->RegisterApplication(
-          GetApplicationObjectPath(), BluetoothGattManagerClient::Options(),
-          callback, base::Bind(&OnRegisterationErrorCallback, error_callback));
+          object_path_, GetApplicationObjectPath(),
+          BluetoothGattManagerClient::Options(), callback,
+          base::Bind(&OnRegisterationErrorCallback, error_callback));
 }
 
 }  // namespace bluez