Reland "Add Linux support for the Bluetooth API"

device/bluetooth/bluetooth_remote_gatt_descriptor_bluez.h

Index: device/bluetooth/bluetooth_remote_gatt_descriptor_bluez.h
diff --git a/device/bluetooth/bluetooth_remote_gatt_descriptor_chromeos.h b/device/bluetooth/bluetooth_remote_gatt_descriptor_bluez.h
similarity index 71%
rename from device/bluetooth/bluetooth_remote_gatt_descriptor_chromeos.h
rename to device/bluetooth/bluetooth_remote_gatt_descriptor_bluez.h
index b32dd87a17d652c82cce8b4f858c1817c8b34ab0..90afaea7035f5647d67378ea4409fb289836dd0b 100644
--- a/device/bluetooth/bluetooth_remote_gatt_descriptor_chromeos.h
+++ b/device/bluetooth/bluetooth_remote_gatt_descriptor_bluez.h
@@ -2,12 +2,13 @@
 // 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_DESCRIPTOR_CHROMEOS_H_
-#define DEVICE_BLUETOOTH_BLUETOOTH_REMOTE_GATT_DESCRIPTOR_CHROMEOS_H_
+#ifndef DEVICE_BLUETOOTH_BLUETOOTH_REMOTE_GATT_DESCRIPTOR_BLUEZ_H_
+#define DEVICE_BLUETOOTH_BLUETOOTH_REMOTE_GATT_DESCRIPTOR_BLUEZ_H_
 
 #include <string>
 #include <vector>
 
+#include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "dbus/object_path.h"
 #include "device/bluetooth/bluetooth_gatt_descriptor.h"
@@ -19,14 +20,14 @@ class BluetoothGattCharacteristic;
 
 }  // namespace device
 
-namespace chromeos {
+namespace bluez {
 
-class BluetoothRemoteGattCharacteristicChromeOS;
+class BluetoothRemoteGattCharacteristicBlueZ;
 
-// The BluetoothRemoteGattDescriptorChromeOS class implements
+// The BluetoothRemoteGattDescriptorBlueZ class implements
 // BluetoothGattDescriptor for remote GATT characteristic descriptors on the
 // Chrome OS platform.

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

Leftover "Chrome OS" reference.

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

Done.

-class BluetoothRemoteGattDescriptorChromeOS
+class BluetoothRemoteGattDescriptorBlueZ
     : public device::BluetoothGattDescriptor {
  public:
   // device::BluetoothGattDescriptor overrides.
@@ -47,12 +48,12 @@ class BluetoothRemoteGattDescriptorChromeOS
   const dbus::ObjectPath& object_path() const { return object_path_; }
 
  private:
-  friend class BluetoothRemoteGattCharacteristicChromeOS;
+  friend class BluetoothRemoteGattCharacteristicBlueZ;
 
-  BluetoothRemoteGattDescriptorChromeOS(
-      BluetoothRemoteGattCharacteristicChromeOS* characteristic,
+  BluetoothRemoteGattDescriptorBlueZ(
+      BluetoothRemoteGattCharacteristicBlueZ* characteristic,
       const dbus::ObjectPath& object_path);
-  ~BluetoothRemoteGattDescriptorChromeOS() override;
+  ~BluetoothRemoteGattDescriptorBlueZ() override;
 
   // Called by dbus:: on unsuccessful completion of a request to read or write
   // the descriptor value.
@@ -64,15 +65,15 @@ class BluetoothRemoteGattDescriptorChromeOS
   dbus::ObjectPath object_path_;
 
   // The GATT characteristic this descriptor belongs to.
-  BluetoothRemoteGattCharacteristicChromeOS* characteristic_;
+  BluetoothRemoteGattCharacteristicBlueZ* characteristic_;
 
   // 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<BluetoothRemoteGattDescriptorChromeOS> weak_ptr_factory_;
+  base::WeakPtrFactory<BluetoothRemoteGattDescriptorBlueZ> weak_ptr_factory_;
 
-  DISALLOW_COPY_AND_ASSIGN(BluetoothRemoteGattDescriptorChromeOS);
+  DISALLOW_COPY_AND_ASSIGN(BluetoothRemoteGattDescriptorBlueZ);
 };
 
-}  // namespace chromeos
+}  // namespace bluez
 
-#endif  // DEVICE_BLUETOOTH_BLUETOOTH_REMOTE_GATT_DESCRIPTOR_CHROMEOS_H_
+#endif  // DEVICE_BLUETOOTH_BLUETOOTH_REMOTE_GATT_DESCRIPTOR_BLUEZ_H_