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

components/proximity_auth/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/bluetooth_low_energy_connection_finder.h"
 
 #include <memory>
 #include <string>
 #include <utility>
 
@@ skipping 25 matching lines @@
 const char kBLEGattServiceUUID[] = "b3b7e28e-a000-3e17-bd86-6e97b9e28c11";
 const int kRestartDiscoveryOnErrorDelaySeconds = 2;
 }  // namespace
 
 BluetoothLowEnergyConnectionFinder::BluetoothLowEnergyConnectionFinder(
     const cryptauth::RemoteDevice remote_device,
     const std::vector<cryptauth::BeaconSeed>& beacon_seeds,
     cryptauth::BluetoothThrottler* bluetooth_throttler)
     : BluetoothLowEnergyConnectionFinder(
           remote_device,
+          kBLEGattServiceUUID,
           beacon_seeds,
           base::MakeUnique<cryptauth::BackgroundEidGenerator>(),
           bluetooth_throttler) {}
 
 BluetoothLowEnergyConnectionFinder::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)
     : remote_device_(remote_device),
+      service_uuid_(service_uuid),
       beacon_seeds_(beacon_seeds),
       eid_generator_(std::move(eid_generator)),
       bluetooth_throttler_(bluetooth_throttler),
       weak_ptr_factory_(this) {}
 
 BluetoothLowEnergyConnectionFinder::~BluetoothLowEnergyConnectionFinder() {
   if (discovery_session_) {
     StopDiscoverySession();
   }
 
@@ skipping 158 matching lines @@
   PA_LOG(INFO) << "Stopping discovery session";
   // Destroying the discovery session also stops it.
   discovery_session_.reset();
 }
 
 std::unique_ptr<cryptauth::Connection>
 BluetoothLowEnergyConnectionFinder::CreateConnection(
     const std::string& device_address) {
   return cryptauth::weave::BluetoothLowEnergyWeaveClientConnection::Factory::
       NewInstance(remote_device_, device_address, adapter_,
-                  device::BluetoothUUID(kBLEGattServiceUUID),
-                  bluetooth_throttler_);
+                  device::BluetoothUUID(service_uuid_), bluetooth_throttler_);
 }
 
 void BluetoothLowEnergyConnectionFinder::OnConnectionStatusChanged(
     cryptauth::Connection* connection,
     cryptauth::Connection::Status old_status,
     cryptauth::Connection::Status new_status) {
   DCHECK_EQ(connection, connection_.get());
   PA_LOG(INFO) << "OnConnectionStatusChanged: " << old_status << " -> "
                << new_status;
 
@@ skipping 25 matching lines @@
   connection_.reset();
   if (!discovery_session_ || !discovery_session_->IsActive())
     StartDiscoverySession();
 }
 
 void BluetoothLowEnergyConnectionFinder::InvokeCallbackAsync() {
   connection_callback_.Run(std::move(connection_));
 }
 
 }  // namespace proximity_auth