Bluetooth low energy connection.

components/proximity_auth/ble/bluetooth_low_energy_connection_finder.cc

 // 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.
 
 #include "components/proximity_auth/ble/bluetooth_low_energy_connection_finder.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "device/bluetooth/bluetooth_adapter_factory.h"
 #include "device/bluetooth/bluetooth_device.h"
 #include "device/bluetooth/bluetooth_discovery_session.h"
 #include "device/bluetooth/bluetooth_uuid.h"
 
+#include "components/proximity_auth/ble/bluetooth_low_energy_connection.h"

[msarda, 2015/05/05 11:56:14]

Sort headers.

[sacomoto, 2015/05/06 13:47:59]

Done.

+
 using device::BluetoothAdapter;
 using device::BluetoothDevice;
 using device::BluetoothGattConnection;
 using device::BluetoothDiscoveryFilter;
 
 namespace proximity_auth {
 
 BluetoothLowEnergyConnectionFinder::BluetoothLowEnergyConnectionFinder(
     const std::string& remote_service_uuid)
     : remote_service_uuid_(device::BluetoothUUID(remote_service_uuid)),
       connected_(false),
       weak_ptr_factory_(this) {
 }
 
 BluetoothLowEnergyConnectionFinder::~BluetoothLowEnergyConnectionFinder() {
   if (discovery_session_) {
     StopDiscoverySession();
   }
   if (adapter_) {
     adapter_->RemoveObserver(this);
     adapter_ = NULL;
   }
 }
 
 void BluetoothLowEnergyConnectionFinder::Find(
-    const BluetoothDevice::GattConnectionCallback& connection_callback) {
+    const ConnectionCallback& connection_callback) {
   if (!device::BluetoothAdapterFactory::IsBluetoothAdapterAvailable()) {
     VLOG(1) << "[BCF] Bluetooth is unsupported on this platform. Aborting.";
     return;
   }
   VLOG(1) << "Finding connection";
 
   connection_callback_ = connection_callback;
 
   device::BluetoothAdapterFactory::GetAdapter(
       base::Bind(&BluetoothLowEnergyConnectionFinder::OnAdapterInitialized,
                  weak_ptr_factory_.GetWeakPtr()));
 }
 
-void BluetoothLowEnergyConnectionFinder::Find(
-    const ConnectionCallback& connection_callback) {
-  NOTREACHED();
-}
-
 void BluetoothLowEnergyConnectionFinder::DeviceAdded(BluetoothAdapter* adapter,
                                                      BluetoothDevice* device) {
   DCHECK(device);
   VLOG(1) << "Device added: " << device->GetAddress();
   HandleDeviceUpdated(device);
 }
 
 void BluetoothLowEnergyConnectionFinder::DeviceChanged(
     BluetoothAdapter* adapter,
     BluetoothDevice* device) {
@@ skipping 122 matching lines @@
 }
 
 void BluetoothLowEnergyConnectionFinder::OnCreateConnectionError(
     std::string device_address,
     BluetoothDevice::ConnectErrorCode error_code) {
   VLOG(1) << "Error creating connection to device " << device_address
           << " : error code = " << error_code;
 }
 
 void BluetoothLowEnergyConnectionFinder::OnConnectionCreated(
-    scoped_ptr<BluetoothGattConnection> connection) {
+    scoped_ptr<BluetoothGattConnection> gatt_connection) {
   if (connected_) {
-    CloseConnection(connection.Pass());
+    CloseConnection(gatt_connection.Pass());
     return;
   }
 
   VLOG(1) << "Connection created";
   connected_ = true;
   pending_connections_.clear();
   if (!connection_callback_.is_null()) {
+    RemoteDevice remote_device;
+    remote_device.bluetooth_address = gatt_connection->GetDeviceAddress();
+    std::string remote_device_address = gatt_connection->GetDeviceAddress();

[msarda, 2015/05/05 11:56:14]

Remove remote_device_address as it is not used.

[sacomoto, 2015/05/06 13:47:59]

Done.

+    scoped_ptr<BluetoothLowEnergyConnection> connection =
+        scoped_ptr<BluetoothLowEnergyConnection>(
+            new BluetoothLowEnergyConnection(remote_device, adapter_,
+                                             remote_service_uuid_,
+                                             gatt_connection.Pass()));
+
     connection_callback_.Run(connection.Pass());
     connection_callback_.Reset();
   }
   StopDiscoverySession();
 }
 
 void BluetoothLowEnergyConnectionFinder::CreateConnection(
     device::BluetoothDevice* remote_device) {
   VLOG(1) << "SmartLock service found ("
           << remote_service_uuid_.canonical_value() << ")\n"
@@ skipping 12 matching lines @@
   connection.reset();
   BluetoothDevice* device = adapter_->GetDevice(device_address);
   if (device) {
     DCHECK(HasService(device));
     VLOG(1) << "Forget device " << device->GetAddress();
     device->Forget(base::Bind(&base::DoNothing));
   }
 }
 
 }  // namespace proximity_auth