Reland "Add Linux support for the Bluetooth API"

device/bluetooth/bluetooth_gatt_notify_session_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_GATT_NOTIFY_SESSION_CHROMEOS_H_
-#define DEVICE_BLUETOOTH_BLUETOOTH_GATT_NOTIFY_SESSION_CHROMEOS_H_
+#ifndef DEVICE_BLUETOOTH_BLUETOOTH_GATT_NOTIFY_SESSION_BLUEZ_H_
+#define DEVICE_BLUETOOTH_BLUETOOTH_GATT_NOTIFY_SESSION_BLUEZ_H_
 
 #include <string>
 
 #include "base/callback.h"
+#include "base/macros.h"
 #include "device/bluetooth/bluetooth_gatt_notify_session.h"
 #include "device/bluetooth/dbus/bluetooth_gatt_characteristic_client.h"
 
 namespace device {
 
 class BluetoothAdapter;
 
 }  // namespace device
 
-namespace chromeos {
+namespace bluez {
 
-class BluetoothRemoteGattCharacteristicChromeOS;
+class BluetoothRemoteGattCharacteristicBlueZ;
 
-// BluetoothGattNotifySessionChromeOS implements
+// BluetoothGattNotifySessionBlueZ implements
 // BluetoothGattNotifySession for the Chrome OS platform.

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

Leftover "Chrome OS" reference.

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

Done.

-class BluetoothGattNotifySessionChromeOS
+class BluetoothGattNotifySessionBlueZ
     : public device::BluetoothGattNotifySession,
       public bluez::BluetoothGattCharacteristicClient::Observer {
  public:
-  ~BluetoothGattNotifySessionChromeOS() override;
+  ~BluetoothGattNotifySessionBlueZ() override;
 
   // BluetoothGattNotifySession overrides.
   std::string GetCharacteristicIdentifier() const override;
   bool IsActive() override;
   void Stop(const base::Closure& callback) override;
 
  private:
-  friend class BluetoothRemoteGattCharacteristicChromeOS;
+  friend class BluetoothRemoteGattCharacteristicBlueZ;
 
-  explicit BluetoothGattNotifySessionChromeOS(
+  explicit BluetoothGattNotifySessionBlueZ(
       scoped_refptr<device::BluetoothAdapter> adapter,
       const std::string& device_address,
       const std::string& service_identifier,
       const std::string& characteristic_identifier,
       const dbus::ObjectPath& characteristic_path);
 
   // bluez::BluetoothGattCharacteristicClient::Observer overrides.
   void GattCharacteristicRemoved(const dbus::ObjectPath& object_path) override;
   void GattCharacteristicPropertyChanged(
       const dbus::ObjectPath& object_path,
@@ skipping 11 matching lines @@
   // The GATT service that the characteristic belongs to.
   std::string service_id_;
 
   // Identifier of the associated characteristic.
   std::string characteristic_id_;
 
   // D-Bus object path of the associated characteristic. This is used to filter
   // observer events.
   dbus::ObjectPath object_path_;
 
-  DISALLOW_COPY_AND_ASSIGN(BluetoothGattNotifySessionChromeOS);
+  DISALLOW_COPY_AND_ASSIGN(BluetoothGattNotifySessionBlueZ);
 };
 
-}  // namespace chromeos
+}  // namespace bluez
 
-#endif  //  DEVICE_BLUETOOTH_BLUETOOTH_GATT_NOTIFY_SESSION_CHROMEOS_H_
+#endif  //  DEVICE_BLUETOOTH_BLUETOOTH_GATT_NOTIFY_SESSION_BLUEZ_H_