[EasyUnlock] Fixing the setup connection finder and message format.

components/proximity_auth/bluetooth_low_energy_connection_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_BLUETOOTH_LOW_ENERGY_CONNECTION_FINDER_H
 #define COMPONENTS_PROXIMITY_AUTH_BLUETOOTH_LOW_ENERGY_CONNECTION_FINDER_H
 
 #include <memory>
 #include <set>
 #include <string>
@@ skipping 51 matching lines @@
   void AdapterPoweredChanged(device::BluetoothAdapter* adapter,
                              bool powered) override;
   void DeviceAdded(device::BluetoothAdapter* adapter,
                    device::BluetoothDevice* device) override;
   void DeviceChanged(device::BluetoothAdapter* adapter,
                      device::BluetoothDevice* device) override;
 
  protected:
   BluetoothLowEnergyConnectionFinder(
       const cryptauth::RemoteDevice remote_device,
+      const std::string& service_uuid,
       const std::vector<cryptauth::BeaconSeed>& beacon_seeds,
       std::unique_ptr<cryptauth::BackgroundEidGenerator> eid_generator,
       cryptauth::BluetoothThrottler* bluetooth_throttler);
 
   // Creates a proximity_auth::Connection with the device given by
   // |device_address|. Exposed for testing.
   virtual std::unique_ptr<cryptauth::Connection> CreateConnection(
       const std::string& device_address);
 
+  // Checks if |device| is advertising the right EID.
+  virtual bool IsRightDevice(device::BluetoothDevice* device);
+
  private:
   // Callback to be called when the Bluetooth adapter is initialized.
   void OnAdapterInitialized(scoped_refptr<device::BluetoothAdapter> adapter);
 
   // Checks if |remote_device| contains |remote_service_uuid| and creates a
   // connection in that case.
   void HandleDeviceUpdated(device::BluetoothDevice* remote_device);
 
   // Callback called when a new discovery session is started.
   void OnDiscoverySessionStarted(
       std::unique_ptr<device::BluetoothDiscoverySession> discovery_session);
 
   // Callback called when there is an error starting a new discovery session.
   void OnStartDiscoverySessionError();
 
   // Starts a discovery session for |adapter_|.
   void StartDiscoverySession();
 
   // Stops the discovery session given by |discovery_session_|.
   void StopDiscoverySession();
 
-  // Checks if |device| is the right device: (i) has the adversement data or
-  // (ii) is paired and is the same as |remote_device|.
-  bool IsRightDevice(device::BluetoothDevice* device);
-
   // Restarts the discovery session after creating |connection_| fails.
   void RestartDiscoverySessionAsync();
 
   // Used to invoke |connection_callback_| asynchronously, decoupling the
   // callback invocation from the ConnectionObserver callstack.
   void InvokeCallbackAsync();
 
   // The remote BLE device being searched. It maybe empty, in this case the
   // remote device should advertise |remote_service_uuid_| and
   // |advertised_name_|.
   cryptauth::RemoteDevice remote_device_;
 
+  // The UUID of the service used by the Weave socket.
+  std::string service_uuid_;
+
   // The BeaconSeeds of the |remote_device|.
   std::vector<cryptauth::BeaconSeed> beacon_seeds_;
 
   // Generates the expected EIDs that may be advertised by |remote_device_|. If
   // an EID matches, we know its a device we should connect to.
   std::unique_ptr<cryptauth::BackgroundEidGenerator> eid_generator_;
 
   // Throttles repeated connection attempts to the same device. This is a
   // workaround for crbug.com/508919. Not owned, must outlive this instance.
   cryptauth::BluetoothThrottler* bluetooth_throttler_;
@@ skipping 11 matching lines @@
   cryptauth::ConnectionFinder::ConnectionCallback connection_callback_;
 
   base::WeakPtrFactory<BluetoothLowEnergyConnectionFinder> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BluetoothLowEnergyConnectionFinder);
 };
 
 }  // namespace proximity_auth
 
 #endif  // COMPONENTS_PROXIMITY_AUTH_BLUETOOTH_LOW_ENERGY_CONNECTION_FINDER_H