Refactor bluetooth_low_energy_win to prepare for new Bluetooth test fixture

device/bluetooth/bluetooth_low_energy_win.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 "device/bluetooth/bluetooth_low_energy_win.h"
 
 #include "base/files/file.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/strings/sys_string_conversions.h"
@@ skipping 593 matching lines @@
   address.ullLong = BLUETOOTH_NULL_ADDRESS;
 }
 
 BluetoothLowEnergyDeviceInfo::~BluetoothLowEnergyDeviceInfo() {
 }
 
 bool IsBluetoothLowEnergySupported() {
   return base::win::GetVersion() >= base::win::VERSION_WIN8;
 }
 
-bool EnumerateKnownBluetoothLowEnergyDevices(
+bool ExtractBluetoothAddressFromDeviceInstanceIdForTesting(
+    const std::string& instance_id,
+    BLUETOOTH_ADDRESS* btha,
+    std::string* error) {
+  return ExtractBluetoothAddressFromDeviceInstanceId(instance_id, btha, error);
+}
+
+static BluetoothLowEnergyHub* instance_ = nullptr;

[scheib, 2016/01/29 04:35:50]

I think you'll want a base/lazy_instance.h as you will be leaking this
allocation. Or, you'll want to have a DeleteInstance() method.

[gogerald1, 2016/02/02 22:00:20]

Done.

+BluetoothLowEnergyHub* BluetoothLowEnergyHub::GetInstance() {
+  if (instance_ == nullptr) {
+    instance_ = new BluetoothLowEnergyHub();
+  }
+  return instance_;
+}
+
+void BluetoothLowEnergyHub::SetInstanceForTest(
+    BluetoothLowEnergyHub* instance) {
+  if (instance_ != nullptr)
+    delete instance_;

[scheib, 2016/01/29 04:35:50]

The if isn't needed. just delete, it works on nullptr.

[gogerald1, 2016/02/02 22:00:20]

Done.

+  instance_ = instance;
+}
+
+BluetoothLowEnergyHub::BluetoothLowEnergyHub() {}
+BluetoothLowEnergyHub::~BluetoothLowEnergyHub() {}
+
+bool BluetoothLowEnergyHub::EnumerateKnownBluetoothLowEnergyDevices(
     ScopedVector<BluetoothLowEnergyDeviceInfo>* devices,
     std::string* error) {
   if (!IsBluetoothLowEnergySupported()) {
     *error = kPlatformNotSupported;
     return false;
   }
 
   ScopedDeviceInfoSetHandle info_set_handle;
   HRESULT hr = OpenBluetoothLowEnergyDevices(&info_set_handle);
   if (FAILED(hr)) {
     *error = FormatBluetoothError(kDeviceEnumError, hr);
     return false;
   }
 
   for (DWORD i = 0;; ++i) {
     scoped_ptr<BluetoothLowEnergyDeviceInfo> device_info;
     DeviceInfoResult result = EnumerateSingleBluetoothLowEnergyDevice(
         info_set_handle, i, &device_info, error);
     switch (result) {
       case kNoMoreDevices:
         return true;
       case kError:
         return false;
       case kOk:
         devices->push_back(device_info.Pass());
     }
   }
 }
 
-bool EnumerateKnownBluetoothLowEnergyServices(
+bool BluetoothLowEnergyHub::EnumerateKnownBluetoothLowEnergyServices(
     const base::FilePath& device_path,
     ScopedVector<BluetoothLowEnergyServiceInfo>* services,
     std::string* error) {
   if (!IsBluetoothLowEnergySupported()) {
     *error = kPlatformNotSupported;
     return false;
   }
 
   return CollectBluetoothLowEnergyDeviceServices(device_path, services, error);
 }
 
-bool ExtractBluetoothAddressFromDeviceInstanceIdForTesting(
-    const std::string& instance_id,
-    BLUETOOTH_ADDRESS* btha,
-    std::string* error) {
-  return ExtractBluetoothAddressFromDeviceInstanceId(instance_id, btha, error);
-}
-
 }  // namespace win
 }  // namespace device