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

chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api.cc

 // 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.
 
 #include "chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api.h"
 
 #include <utility>
 #include <vector>
 
 #include "base/base64url.h"
@@ skipping 19 matching lines @@
 #include "chrome/browser/ui/proximity_auth/proximity_auth_error_bubble.h"
 #include "chrome/common/extensions/api/easy_unlock_private.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/cryptauth/bluetooth_throttler_impl.h"
 #include "components/cryptauth/cryptauth_device_manager.h"
 #include "components/cryptauth/cryptauth_enrollment_manager.h"
 #include "components/cryptauth/cryptauth_enrollment_utils.h"
 #include "components/cryptauth/proto/cryptauth_api.pb.h"
 #include "components/cryptauth/remote_device.h"
 #include "components/cryptauth/secure_message_delegate.h"
-#include "components/proximity_auth/bluetooth_low_energy_connection_finder.h"
+#include "components/proximity_auth/bluetooth_low_energy_setup_connection_finder.h"
 #include "components/proximity_auth/bluetooth_util.h"
 #include "components/proximity_auth/logging/logging.h"
 #include "components/proximity_auth/proximity_auth_client.h"
 #include "components/proximity_auth/screenlock_bridge.h"
 #include "components/proximity_auth/screenlock_state.h"
 #include "components/proximity_auth/switches.h"
 #include "components/signin/core/account_id/account_id.h"
 #include "content/public/browser/web_contents.h"
 #include "extensions/browser/browser_context_keyed_api_factory.h"
 #include "ui/base/l10n/l10n_util.h"
@@ skipping 1025 matching lines @@
   results_ = easy_unlock_private::FindSetupConnection::Results::Create(
       connection_id, device_address);
   SendResponse(true);
 }
 
 bool EasyUnlockPrivateFindSetupConnectionFunction::RunAsync() {
   std::unique_ptr<easy_unlock_private::FindSetupConnection::Params> params =
       easy_unlock_private::FindSetupConnection::Params::Create(*args_);
   EXTENSION_FUNCTION_VALIDATE(params);
 
-  // TODO(tengs): Reimplement scanning for the remote device.
+  // Creates a BLE connection finder to look for any device advertising
+  // |params->setup_service_uuid|.
+  connection_finder_.reset(
+      new proximity_auth::BluetoothLowEnergySetupConnectionFinder(
+          params->setup_service_uuid,
+          cryptauth::BluetoothThrottlerImpl::GetInstance()));
+
+  connection_finder_->Find(base::Bind(
+      &EasyUnlockPrivateFindSetupConnectionFunction::OnConnectionFound, this));
 
   timer_.reset(new base::OneShotTimer());
   timer_->Start(FROM_HERE, base::TimeDelta::FromSeconds(params->time_out),
                 base::Bind(&EasyUnlockPrivateFindSetupConnectionFunction::
                                OnConnectionFinderTimedOut,
                            this));
 
   return true;
 }
 
@@ skipping 72 matching lines @@
       GetConnectionManager(browser_context())
           ->GetDeviceAddress(extension(), params->connection_id);
   if (device_address.empty())
     return RespondNow(Error("Invalid connectionId."));
   return RespondNow(ArgumentList(
       easy_unlock_private::SetupConnectionGetDeviceAddress::Results::Create(
           device_address)));
 }
 
 }  // namespace extensions