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

components/proximity_auth/ble/bluetooth_low_energy_characteristics_finder.h

 // Copyright 2015 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 COMPONENTS_PROXIMITY_AUTH_BLE_BLUETOOTH_LOW_ENERGY_CHARACTERISTICS_FINDER_H
-#define COMPONENTS_PROXIMITY_AUTH_BLE_BLUETOOTH_LOW_ENERGY_CHARACTERISTICS_FINDER_H
+#ifndef COMPONENTS_PROXIMITY_AUTH_BLE_BLUETOOTH_LOW_ENERGY_CHARACTERISTICS_FINDER_H_
+#define COMPONENTS_PROXIMITY_AUTH_BLE_BLUETOOTH_LOW_ENERGY_CHARACTERISTICS_FINDER_H_

[tbarzic, 2016/04/18 22:12:02]

nit: update #endif line

[rkc, 2016/04/19 07:03:39]

Done.

 
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "components/proximity_auth/ble/remote_attribute.h"
 #include "device/bluetooth/bluetooth_adapter.h"
 #include "device/bluetooth/bluetooth_device.h"
-#include "device/bluetooth/bluetooth_gatt_characteristic.h"
+#include "device/bluetooth/bluetooth_remote_gatt_characteristic.h"
+#include "device/bluetooth/bluetooth_remote_gatt_service.h"
 #include "device/bluetooth/bluetooth_uuid.h"
 
 namespace proximity_auth {
 
 // Looks for given characteristics in a remote device, for which a GATT
 // connection was already established. In the current BLE connection protocol
 // (device::BluetoothDevice::CreateGattConnection), remote characteristic
 // discovery starts immediatelly after a GATT connection was established. So,
 // this class simply adds an observer for a characteristic discovery event and
 // call |success_callback_| once all necessary characteristics were discovered.
@@ skipping 31 matching lines @@
       const RemoteAttribute& from_peripheral_char,
       const SuccessCallback& success_callback,
       const ErrorCallback& error_callback);
 
   ~BluetoothLowEnergyCharacteristicsFinder() override;
 
  protected:
   // device::BluetoothAdapter::Observer:
   void GattDiscoveryCompleteForService(
       device::BluetoothAdapter* adapter,
-      device::BluetoothGattService* service) override;
+      device::BluetoothRemoteGattService* service) override;
   void GattCharacteristicAdded(
       device::BluetoothAdapter* adapter,
-      device::BluetoothGattCharacteristic* characteristic) override;
+      device::BluetoothRemoteGattCharacteristic* characteristic) override;
 
   // For testing. Used to mock this class.
   BluetoothLowEnergyCharacteristicsFinder();
 
  private:
   // Handles the discovery of a new characteristic.
   void HandleCharacteristicUpdate(
-      device::BluetoothGattCharacteristic* characteristic);
+      device::BluetoothRemoteGattCharacteristic* characteristic);
 
   // Scans the remote chracteristics of the service with |uuid| in |device|
   // calling HandleCharacteristicUpdate() for each of them.
   void ScanRemoteCharacteristics(device::BluetoothDevice* device,
                                  const device::BluetoothUUID& uuid);
 
   // Updates the value of |to_peripheral_char_| and
   // |from_peripheral_char_|
   // when |characteristic| was found.
   void UpdateCharacteristicsStatus(
-      device::BluetoothGattCharacteristic* characteristic);
+      device::BluetoothRemoteGattCharacteristic* characteristic);
 
   // Resets |success_callback_| and |success_callback_|. This should be called
   // whenever a callback is called to avoid multiple callbacks calls.
   void ResetCallbacks();
 
   // The Bluetooth adapter where the connection was established.
   scoped_refptr<device::BluetoothAdapter> adapter_;
 
   // Remote service the |connection_| was established with.
   RemoteAttribute remote_service_;
 
   // Characteristic used to receive data from the remote device.
   RemoteAttribute to_peripheral_char_;
 
   // Characteristic used to receive data from the remote device.
   RemoteAttribute from_peripheral_char_;
 
   // Called when all characteristics were found.
   SuccessCallback success_callback_;
 
   // Called when there is an error.
   ErrorCallback error_callback_;
 
   DISALLOW_COPY_AND_ASSIGN(BluetoothLowEnergyCharacteristicsFinder);
 };
 
 }  // namespace proximity_auth
 
 #endif  // COMPONENTS_PROXIMITY_AUTH_BLE_BLUETOOTH_CHARACTERISTICS_FINDER_H