Complete //device/bt implementation for hosting local GATT attributes.

device/bluetooth/dbus/bluetooth_gatt_manager_client.cc

 // Copyright 2014 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_manager_client.h"
 
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "dbus/bus.h"
 #include "dbus/message.h"
 #include "dbus/object_proxy.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
 namespace bluez {
 
 const char BluetoothGattManagerClient::kNoResponseError[] =
     "org.chromium.Error.NoResponse";
 
 // The BluetoothGattManagerClient implementation used in production.
 class BluetoothGattManagerClientImpl : public BluetoothGattManagerClient {
  public:
   BluetoothGattManagerClientImpl()
       : object_proxy_(NULL), weak_ptr_factory_(this) {}
 
   ~BluetoothGattManagerClientImpl() override {}
 
   // BluetoothGattManagerClient override.
-  void RegisterService(const dbus::ObjectPath& service_path,
-                       const Options& options,
-                       const base::Closure& callback,
-                       const ErrorCallback& error_callback) override {
+  void RegisterApplication(const dbus::ObjectPath& application_path,
+                           const Options& options,
+                           const base::Closure& callback,
+                           const ErrorCallback& error_callback) override {
     dbus::MethodCall method_call(
         bluetooth_gatt_manager::kBluetoothGattManagerInterface,
         bluetooth_gatt_manager::kRegisterService);
 
     dbus::MessageWriter writer(&method_call);
-    writer.AppendObjectPath(service_path);
+    writer.AppendObjectPath(application_path);
 
-    // TODO(armansito): The parameters of the Options dictionary are undefined
-    // but the method signature still requires a value dictionary. Pass an
-    // empty dictionary and fill in the contents later once this is defined.
+    // The parameters of the Options dictionary are undefined but the method
+    // signature still requires a value dictionary. Pass an empty dictionary
+    // and fill in the contents later if and when we add any options.
     dbus::MessageWriter array_writer(NULL);
     writer.OpenArray("{sv}", &array_writer);
     writer.CloseContainer(&array_writer);
 
     DCHECK(object_proxy_);
     object_proxy_->CallMethodWithErrorCallback(
         &method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
         base::Bind(&BluetoothGattManagerClientImpl::OnSuccess,
                    weak_ptr_factory_.GetWeakPtr(), callback),
         base::Bind(&BluetoothGattManagerClientImpl::OnError,
                    weak_ptr_factory_.GetWeakPtr(), error_callback));
   }
 
   // BluetoothGattManagerClient override.
-  void UnregisterService(const dbus::ObjectPath& service_path,
-                         const base::Closure& callback,
-                         const ErrorCallback& error_callback) override {
+  void UnregisterApplication(const dbus::ObjectPath& application_path,
+                             const base::Closure& callback,
+                             const ErrorCallback& error_callback) override {
     dbus::MethodCall method_call(
         bluetooth_gatt_manager::kBluetoothGattManagerInterface,
         bluetooth_gatt_manager::kUnregisterService);
 
     dbus::MessageWriter writer(&method_call);
-    writer.AppendObjectPath(service_path);
+    writer.AppendObjectPath(application_path);
 
     DCHECK(object_proxy_);
     object_proxy_->CallMethodWithErrorCallback(
         &method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
         base::Bind(&BluetoothGattManagerClientImpl::OnSuccess,
                    weak_ptr_factory_.GetWeakPtr(), callback),
         base::Bind(&BluetoothGattManagerClientImpl::OnError,
                    weak_ptr_factory_.GetWeakPtr(), error_callback));
   }
 
@@ skipping 45 matching lines @@
 BluetoothGattManagerClient::BluetoothGattManagerClient() {}
 
 BluetoothGattManagerClient::~BluetoothGattManagerClient() {}
 
 // static
 BluetoothGattManagerClient* BluetoothGattManagerClient::Create() {
   return new BluetoothGattManagerClientImpl();
 }
 
 }  // namespace bluez