Reland "Add Linux support for the Bluetooth API"

device/bluetooth/bluetooth_remote_gatt_characteristic_bluez.h

 // 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.
 
-#ifndef DEVICE_BLUETOOTH_BLUETOOTH_REMOTE_GATT_CHARACTERISTIC_CHROMEOS_H_
-#define DEVICE_BLUETOOTH_BLUETOOTH_REMOTE_GATT_CHARACTERISTIC_CHROMEOS_H_
+#ifndef DEVICE_BLUETOOTH_BLUETOOTH_REMOTE_GATT_CHARACTERISTIC_BLUEZ_H_
+#define DEVICE_BLUETOOTH_BLUETOOTH_REMOTE_GATT_CHARACTERISTIC_BLUEZ_H_
 
 #include <map>
 #include <queue>
 #include <string>
 #include <utility>
 #include <vector>
 
+#include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "dbus/object_path.h"
 #include "device/bluetooth/bluetooth_gatt_characteristic.h"
 #include "device/bluetooth/bluetooth_uuid.h"
 #include "device/bluetooth/dbus/bluetooth_gatt_descriptor_client.h"
 
 namespace device {
 
 class BluetoothGattDescriptor;
 class BluetoothGattService;
 
 }  // namespace device
 
-namespace chromeos {
+namespace bluez {
 
-class BluetoothRemoteGattDescriptorChromeOS;
-class BluetoothRemoteGattServiceChromeOS;
+class BluetoothRemoteGattDescriptorBlueZ;
+class BluetoothRemoteGattServiceBlueZ;
 
-// The BluetoothRemoteGattCharacteristicChromeOS class implements
+// The BluetoothRemoteGattCharacteristicBlueZ class implements
 // BluetoothGattCharacteristic for remote GATT characteristics on the Chrome OS

[ortuno, 2015/11/06 18:15:41]

Leftover "Chrome OS" reference.

[rkc, 2015/11/25 00:48:16]

Done.

 // platform.
-class BluetoothRemoteGattCharacteristicChromeOS
+class BluetoothRemoteGattCharacteristicBlueZ
     : public device::BluetoothGattCharacteristic,
       public bluez::BluetoothGattDescriptorClient::Observer {
  public:
   // device::BluetoothGattCharacteristic overrides.
   std::string GetIdentifier() const override;
   device::BluetoothUUID GetUUID() const override;
   bool IsLocal() const override;
   const std::vector<uint8>& GetValue() const override;
   device::BluetoothGattService* GetService() const override;
   Properties GetProperties() const override;
@@ skipping 15 matching lines @@
   // Removes one value update session and invokes |callback| on completion. This
   // decrements the session reference count by 1 and if the number reaches 0,
   // makes a call to the subsystem to stop notifications from this
   // characteristic.
   void RemoveNotifySession(const base::Closure& callback);
 
   // Object path of the underlying D-Bus characteristic.
   const dbus::ObjectPath& object_path() const { return object_path_; }
 
  private:
-  friend class BluetoothRemoteGattServiceChromeOS;
+  friend class BluetoothRemoteGattServiceBlueZ;
 
   typedef std::pair<NotifySessionCallback, ErrorCallback>
       PendingStartNotifyCall;
 
-  BluetoothRemoteGattCharacteristicChromeOS(
-      BluetoothRemoteGattServiceChromeOS* service,
+  BluetoothRemoteGattCharacteristicBlueZ(
+      BluetoothRemoteGattServiceBlueZ* service,
       const dbus::ObjectPath& object_path);
-  ~BluetoothRemoteGattCharacteristicChromeOS() override;
+  ~BluetoothRemoteGattCharacteristicBlueZ() override;
 
   // bluez::BluetoothGattDescriptorClient::Observer overrides.
   void GattDescriptorAdded(const dbus::ObjectPath& object_path) override;
   void GattDescriptorRemoved(const dbus::ObjectPath& object_path) override;
   void GattDescriptorPropertyChanged(const dbus::ObjectPath& object_path,
                                      const std::string& property_name) override;
 
   // Called by dbus:: on unsuccessful completion of a request to read or write
   // the characteristic value.
   void OnError(const ErrorCallback& error_callback,
@@ skipping 20 matching lines @@
                          const std::string& error_name,
                          const std::string& error_message);
 
   // Calls StartNotifySession for each queued request.
   void ProcessStartNotifyQueue();
 
   // Object path of the D-Bus characteristic object.
   dbus::ObjectPath object_path_;
 
   // The GATT service this GATT characteristic belongs to.
-  BluetoothRemoteGattServiceChromeOS* service_;
+  BluetoothRemoteGattServiceBlueZ* service_;
 
   // The total number of currently active value update sessions.
   size_t num_notify_sessions_;
 
   // Calls to StartNotifySession that are pending. This can happen during the
   // first remote call to start notifications.
   std::queue<PendingStartNotifyCall> pending_start_notify_calls_;
 
   // True, if a Start or Stop notify call to bluetoothd is currently pending.
   bool notify_call_pending_;
 
   // Mapping from GATT descriptor object paths to descriptor objects owned by
   // this characteristic. Since the Chrome OS implementation uses object paths

[ortuno, 2015/11/06 18:15:42]

Leftover "Chrome OS" reference.

[rkc, 2015/11/25 00:48:16]

Done.

   // as unique identifiers, we also use this mapping to return descriptors by
   // identifier.
-  typedef std::map<dbus::ObjectPath, BluetoothRemoteGattDescriptorChromeOS*>
+  typedef std::map<dbus::ObjectPath, BluetoothRemoteGattDescriptorBlueZ*>
       DescriptorMap;
   DescriptorMap descriptors_;
 
   // Note: This should remain the last member so it'll be destroyed and
   // invalidate its weak pointers before any other members are destroyed.
-  base::WeakPtrFactory<BluetoothRemoteGattCharacteristicChromeOS>
+  base::WeakPtrFactory<BluetoothRemoteGattCharacteristicBlueZ>
       weak_ptr_factory_;
 
-  DISALLOW_COPY_AND_ASSIGN(BluetoothRemoteGattCharacteristicChromeOS);
+  DISALLOW_COPY_AND_ASSIGN(BluetoothRemoteGattCharacteristicBlueZ);
 };
 
-}  // namespace chromeos
+}  // namespace bluez
 
-#endif  // DEVICE_BLUETOOTH_BLUETOOTH_REMOTE_GATT_CHARACTERISTIC_CHROMEOS_H_
+#endif  // DEVICE_BLUETOOTH_BLUETOOTH_REMOTE_GATT_CHARACTERISTIC_BLUEZ_H_