Refactor device::BluetoothGattXXX classes to split into remote/local.

device/bluetooth/bluez/bluetooth_remote_gatt_characteristic_bluez.cc

-// Copyright 2014 The Chromium Authors. All rights reserved.
+// 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/bluetooth_remote_gatt_characteristic_bluez.h"
+#include "device/bluetooth/bluez/bluetooth_remote_gatt_characteristic_bluez.h"
 
 #include <iterator>
 #include <limits>
-#include <ostream>
 
 #include "base/bind.h"
 #include "base/callback.h"
-#include "base/callback_forward.h"
 #include "base/logging.h"
 #include "base/strings/stringprintf.h"
 #include "dbus/property.h"
-#include "device/bluetooth/bluetooth_adapter_bluez.h"
 #include "device/bluetooth/bluetooth_device.h"
 #include "device/bluetooth/bluetooth_gatt_characteristic.h"
-#include "device/bluetooth/bluetooth_gatt_descriptor_bluez.h"
-#include "device/bluetooth/bluetooth_gatt_notify_session_bluez.h"
 #include "device/bluetooth/bluetooth_gatt_service.h"
-#include "device/bluetooth/bluetooth_remote_gatt_service_bluez.h"
+#include "device/bluetooth/bluez/bluetooth_adapter_bluez.h"
+#include "device/bluetooth/bluez/bluetooth_gatt_notify_session_bluez.h"
+#include "device/bluetooth/bluez/bluetooth_remote_gatt_descriptor_bluez.h"
+#include "device/bluetooth/bluez/bluetooth_remote_gatt_service_bluez.h"
 #include "device/bluetooth/dbus/bluetooth_gatt_characteristic_client.h"
 #include "device/bluetooth/dbus/bluez_dbus_manager.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
 namespace bluez {
 
 namespace {
 
 // Stream operator for logging vector<uint8_t>.
 std::ostream& operator<<(std::ostream& out, const std::vector<uint8_t> bytes) {
   out << "[";
   for (std::vector<uint8_t>::const_iterator iter = bytes.begin();
        iter != bytes.end(); ++iter) {
     out << base::StringPrintf("%02X", *iter);
   }
   return out << "]";
 }
 
 }  // namespace
 
 BluetoothRemoteGattCharacteristicBlueZ::BluetoothRemoteGattCharacteristicBlueZ(
     BluetoothRemoteGattServiceBlueZ* service,
     const dbus::ObjectPath& object_path)
-    : BluetoothGattCharacteristicBlueZ(service, object_path),
+    : BluetoothGattCharacteristicBlueZ(object_path),
       num_notify_sessions_(0),
       notify_call_pending_(false),
+      service_(service),
       weak_ptr_factory_(this) {
   VLOG(1) << "Creating remote GATT characteristic with identifier: "
           << GetIdentifier() << ", UUID: " << GetUUID().canonical_value();
   bluez::BluezDBusManager::Get()
       ->GetBluetoothGattDescriptorClient()
       ->AddObserver(this);
 
   // Add all known GATT characteristic descriptors.
   const std::vector<dbus::ObjectPath>& gatt_descs =
       bluez::BluezDBusManager::Get()
@@ skipping 13 matching lines @@
   // Clean up all the descriptors. There isn't much point in notifying service
   // observers for each descriptor that gets removed, so just delete them.
   for (DescriptorMap::iterator iter = descriptors_.begin();
        iter != descriptors_.end(); ++iter)
     delete iter->second;
 
   // Report an error for all pending calls to StartNotifySession.
   while (!pending_start_notify_calls_.empty()) {
     PendingStartNotifyCall callbacks = pending_start_notify_calls_.front();
     pending_start_notify_calls_.pop();
-    callbacks.second.Run(device::BluetoothGattService::GATT_ERROR_FAILED);
+    callbacks.second.Run(device::BluetoothRemoteGattService::GATT_ERROR_FAILED);
   }
 }
 
 device::BluetoothUUID BluetoothRemoteGattCharacteristicBlueZ::GetUUID() const {
   bluez::BluetoothGattCharacteristicClient::Properties* properties =
       bluez::BluezDBusManager::Get()
           ->GetBluetoothGattCharacteristicClient()
           ->GetProperties(object_path());
   DCHECK(properties);
   return device::BluetoothUUID(properties->uuid.value());
 }
 
-bool BluetoothRemoteGattCharacteristicBlueZ::IsLocal() const {
-  return false;
-}
-
-const std::vector<uint8_t>& BluetoothRemoteGattCharacteristicBlueZ::GetValue()
-    const {
-  bluez::BluetoothGattCharacteristicClient::Properties* properties =
-      bluez::BluezDBusManager::Get()
-          ->GetBluetoothGattCharacteristicClient()
-          ->GetProperties(object_path());
-
-  DCHECK(properties);
-
-  return properties->value.value();
-}
-
-device::BluetoothGattCharacteristic::Properties
+device::BluetoothRemoteGattCharacteristic::Properties
 BluetoothRemoteGattCharacteristicBlueZ::GetProperties() const {
   bluez::BluetoothGattCharacteristicClient::Properties* properties =
       bluez::BluezDBusManager::Get()
           ->GetBluetoothGattCharacteristicClient()
           ->GetProperties(object_path());
   DCHECK(properties);
 
   Properties props = PROPERTY_NONE;
   const std::vector<std::string>& flags = properties->flags.value();
   for (std::vector<std::string>::const_iterator iter = flags.begin();
@@ skipping 16 matching lines @@
       props |= PROPERTY_EXTENDED_PROPERTIES;
     if (*iter == bluetooth_gatt_characteristic::kFlagReliableWrite)
       props |= PROPERTY_RELIABLE_WRITE;
     if (*iter == bluetooth_gatt_characteristic::kFlagWritableAuxiliaries)
       props |= PROPERTY_WRITABLE_AUXILIARIES;
   }
 
   return props;
 }
 
+device::BluetoothRemoteGattCharacteristic::Permissions
+BluetoothRemoteGattCharacteristicBlueZ::GetPermissions() const {
+  // TODO(armansito): Once BlueZ defines the permissions, return the correct
+  // values here.
+  return PERMISSION_NONE;
+}
+
+const std::vector<uint8_t>& BluetoothRemoteGattCharacteristicBlueZ::GetValue()
+    const {
+  bluez::BluetoothGattCharacteristicClient::Properties* properties =
+      bluez::BluezDBusManager::Get()
+          ->GetBluetoothGattCharacteristicClient()
+          ->GetProperties(object_path());
+
+  DCHECK(properties);
+
+  return properties->value.value();
+}
+
+device::BluetoothRemoteGattService*
+BluetoothRemoteGattCharacteristicBlueZ::GetService() const {
+  return service_;
+}
+
 bool BluetoothRemoteGattCharacteristicBlueZ::IsNotifying() const {
   bluez::BluetoothGattCharacteristicClient::Properties* properties =
       bluez::BluezDBusManager::Get()
           ->GetBluetoothGattCharacteristicClient()
           ->GetProperties(object_path());
   DCHECK(properties);
 
   return properties->notifying.value();
 }
 
-bool BluetoothRemoteGattCharacteristicBlueZ::AddDescriptor(
-    device::BluetoothGattDescriptor* descriptor) {
-  VLOG(1) << "Descriptors cannot be added to a remote GATT characteristic.";
-  return false;
+std::vector<device::BluetoothRemoteGattDescriptor*>
+BluetoothRemoteGattCharacteristicBlueZ::GetDescriptors() const {
+  std::vector<device::BluetoothRemoteGattDescriptor*> descriptors;
+  for (DescriptorMap::const_iterator iter = descriptors_.begin();
+       iter != descriptors_.end(); ++iter)
+    descriptors.push_back(iter->second);
+  return descriptors;
 }
 
-bool BluetoothRemoteGattCharacteristicBlueZ::UpdateValue(
-    const std::vector<uint8_t>& value) {
-  VLOG(1) << "Cannot update the value of a remote GATT characteristic.";
-  return false;
+device::BluetoothRemoteGattDescriptor*
+BluetoothRemoteGattCharacteristicBlueZ::GetDescriptor(
+    const std::string& identifier) const {
+  DescriptorMap::const_iterator iter =
+      descriptors_.find(dbus::ObjectPath(identifier));
+  if (iter == descriptors_.end())
+    return nullptr;
+  return iter->second;
 }
 
 void BluetoothRemoteGattCharacteristicBlueZ::StartNotifySession(
     const NotifySessionCallback& callback,
     const ErrorCallback& error_callback) {
   VLOG(1) << __func__;
 
   if (num_notify_sessions_ > 0) {
     // The characteristic might have stopped notifying even though the session
     // count is nonzero. This means that notifications stopped outside of our
     // control and we should reset the count. If the characteristic is still
     // notifying, then return success. Otherwise, reset the count and treat
     // this call as if the count were 0.
     if (IsNotifying()) {
       // Check for overflows, though unlikely.
       if (num_notify_sessions_ == std::numeric_limits<size_t>::max()) {
-        error_callback.Run(device::BluetoothGattService::GATT_ERROR_FAILED);
+        error_callback.Run(
+            device::BluetoothRemoteGattService::GATT_ERROR_FAILED);
         return;
       }
 
       ++num_notify_sessions_;
       DCHECK(service_);
       DCHECK(service_->GetAdapter());
       DCHECK(service_->GetDevice());
       std::unique_ptr<device::BluetoothGattNotifySession> session(
           new BluetoothGattNotifySessionBlueZ(
               service_->GetAdapter(), service_->GetDevice()->GetAddress(),
@@ skipping 104 matching lines @@
           ->GetProperties(object_path);
   DCHECK(properties);
   if (properties->characteristic.value() != this->object_path()) {
     VLOG(3) << "Remote GATT descriptor does not belong to this characteristic.";
     return;
   }
 
   VLOG(1) << "Adding new remote GATT descriptor for GATT characteristic: "
           << GetIdentifier() << ", UUID: " << GetUUID().canonical_value();
 
-  BluetoothGattDescriptorBlueZ* descriptor =
-      new BluetoothGattDescriptorBlueZ(this, object_path, false /* is_local */);
+  BluetoothRemoteGattDescriptorBlueZ* descriptor =
+      new BluetoothRemoteGattDescriptorBlueZ(this, object_path);
   descriptors_[object_path] = descriptor;
   DCHECK(descriptor->GetIdentifier() == object_path.value());
   DCHECK(descriptor->GetUUID().IsValid());
   DCHECK(service_);
 
   static_cast<BluetoothRemoteGattServiceBlueZ*>(service_)
       ->NotifyDescriptorAddedOrRemoved(this, descriptor, true /* added */);
 }
 
 void BluetoothRemoteGattCharacteristicBlueZ::GattDescriptorRemoved(
     const dbus::ObjectPath& object_path) {
   DescriptorMap::iterator iter = descriptors_.find(object_path);
   if (iter == descriptors_.end()) {
     VLOG(2) << "Unknown descriptor removed: " << object_path.value();
     return;
   }
 
   VLOG(1) << "Removing remote GATT descriptor from characteristic: "
           << GetIdentifier() << ", UUID: " << GetUUID().canonical_value();
 
-  BluetoothGattDescriptorBlueZ* descriptor = iter->second;
+  BluetoothRemoteGattDescriptorBlueZ* descriptor = iter->second;
   DCHECK(descriptor->object_path() == object_path);
   descriptors_.erase(iter);
 
   DCHECK(service_);
   static_cast<BluetoothRemoteGattServiceBlueZ*>(service_)
       ->NotifyDescriptorAddedOrRemoved(this, descriptor, false /* added */);
 
   delete descriptor;
 }
 
@@ skipping 98 matching lines @@
     const ErrorCallback& error_callback,
     const std::string& error_name,
     const std::string& error_message) {
   VLOG(1) << "Operation failed: " << error_name
           << ", message: " << error_message;
   error_callback.Run(
       BluetoothGattServiceBlueZ::DBusErrorToServiceError(error_name));
 }
 
 }  // namespace bluez