[CrOS Tether] Make BluetoothThrottler a singleton which can be easily shared between EasyUnlock and…

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 1031 matching lines @@
     error_message = *params->result.error_message;
 
   Profile* profile = Profile::FromBrowserContext(browser_context());
   EasyUnlockService::Get(profile)
       ->SetAutoPairingResult(params->result.success, error_message);
 
   return RespondNow(NoArguments());
 }
 
 EasyUnlockPrivateFindSetupConnectionFunction::
-    EasyUnlockPrivateFindSetupConnectionFunction()
-    : bluetooth_throttler_(new cryptauth::BluetoothThrottlerImpl(
-          base::MakeUnique<base::DefaultTickClock>())) {}
+    EasyUnlockPrivateFindSetupConnectionFunction() {}
 
 EasyUnlockPrivateFindSetupConnectionFunction::
     ~EasyUnlockPrivateFindSetupConnectionFunction() {
-  // |connection_finder_| has a raw pointer to |bluetooth_throttler_|, so it
-  // should be destroyed first.
   connection_finder_.reset();
-  bluetooth_throttler_.reset();
 }
 
 void EasyUnlockPrivateFindSetupConnectionFunction::
     OnConnectionFinderTimedOut() {
   SetError("No connection found.");
   connection_finder_.reset();
   SendResponse(false);
 }
 
 void EasyUnlockPrivateFindSetupConnectionFunction::OnConnectionFound(
@@ skipping 13 matching lines @@
   std::unique_ptr<easy_unlock_private::FindSetupConnection::Params> params =
       easy_unlock_private::FindSetupConnection::Params::Create(*args_);
   EXTENSION_FUNCTION_VALIDATE(params);
 
   // Creates a BLE connection finder to look for any device advertising
   // |params->setup_service_uuid|.
   connection_finder_.reset(
       new proximity_auth::BluetoothLowEnergyConnectionFinder(
           cryptauth::RemoteDevice(), params->setup_service_uuid,
           proximity_auth::BluetoothLowEnergyConnectionFinder::FIND_ANY_DEVICE,
-          nullptr, bluetooth_throttler_.get(), 3));
+          nullptr, cryptauth::BluetoothThrottlerImpl::GetInstance(), 3));
 
   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));
 
@@ skipping 75 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