bluetooth: Move FactoryWrapper to device and expose a function for testing in chooser controller

device/bluetooth/bluetooth_adapter_factory_wrapper.h

Index: device/bluetooth/bluetooth_adapter_factory_wrapper.h
diff --git a/content/browser/bluetooth/bluetooth_adapter_factory_wrapper.h b/device/bluetooth/bluetooth_adapter_factory_wrapper.h
similarity index 62%
rename from content/browser/bluetooth/bluetooth_adapter_factory_wrapper.h
rename to device/bluetooth/bluetooth_adapter_factory_wrapper.h
index 233802ca0ebbeaba376a93996dc6ad77218bfb02..2557e59c1d7a858252583fbeeafcf6ee5ac364f5 100644
--- a/content/browser/bluetooth/bluetooth_adapter_factory_wrapper.h
+++ b/device/bluetooth/bluetooth_adapter_factory_wrapper.h
@@ -2,19 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_BROWSER_BLUETOOTH_BLUETOOTH_ADAPTER_FACTORY_WRAPPER_H_
-#define CONTENT_BROWSER_BLUETOOTH_BLUETOOTH_ADAPTER_FACTORY_WRAPPER_H_
+#ifndef DEVICE_BLUETOOTH_BLUETOOTH_ADAPTER_FACTORY_WRAPPER_H_
+#define DEVICE_BLUETOOTH_BLUETOOTH_ADAPTER_FACTORY_WRAPPER_H_
 
 #include <unordered_set>
 
+#include "base/lazy_instance.h"
 #include "base/macros.h"
-#include "base/time/time.h"
-#include "content/common/content_export.h"
 #include "device/bluetooth/bluetooth_adapter.h"
+#include "device/bluetooth/bluetooth_export.h"
 
-namespace content {
-
-class WebBluetoothServiceImpl;
+namespace device {
 
 // Wrapper around BluetoothAdapterFactory that allows us to change
 // the underlying BluetoothAdapter object and have the observers
@@ -22,14 +20,14 @@ class WebBluetoothServiceImpl;
 // TODO(ortuno): Once there is no need to swap the adapter to change its
 // behavior observers should add/remove themselves to/from the adapter.
 // http://crbug.com/603291
-class CONTENT_EXPORT BluetoothAdapterFactoryWrapper final {
+class DEVICE_BLUETOOTH_EXPORT BluetoothAdapterFactoryWrapper {
  public:
-  typedef base::Callback<void(device::BluetoothAdapter*)>
-      AcquireAdapterCallback;
+  typedef base::Callback<void(BluetoothAdapter*)> AcquireAdapterCallback;
 
-  BluetoothAdapterFactoryWrapper();
   ~BluetoothAdapterFactoryWrapper();
 
+  static BluetoothAdapterFactoryWrapper& Get();
+
   // Returns true if the platform supports Bluetooth or if
   // SetBluetoothAdapterForTesting has been called.
   bool IsBluetoothAdapterAvailable();
@@ -38,52 +36,47 @@ class CONTENT_EXPORT BluetoothAdapterFactoryWrapper final {
   // acquired the adapter in the past it adds |observer| as an observer to that
   // adapter, otherwise it gets a new adapter and adds |observer| to it. Runs
   // |callback| with the adapter |observer| has been added to.
-  void AcquireAdapter(device::BluetoothAdapter::Observer* observer,
+  void AcquireAdapter(BluetoothAdapter::Observer* observer,
                       const AcquireAdapterCallback& callback);
   // Removes |observer| from the list of adapter observers if |observer|
   // has acquired the adapter in the past. If there are no more observers
   // it deletes the reference to the adapter.
-  void ReleaseAdapter(device::BluetoothAdapter::Observer* observer);
+  void ReleaseAdapter(BluetoothAdapter::Observer* observer);
 
   // Returns an adapter if |observer| has acquired an adapter in the past and
   // this instance holds a reference to an adapter. Otherwise returns nullptr.
-  device::BluetoothAdapter* GetAdapter(
-      device::BluetoothAdapter::Observer* observer);
-
-  // The period of time a device discovery session should be active for.
-  // Returns 0 if SetBluetoothAdapterForTesting has been called.
-  base::TimeDelta GetScanDuration() { return scan_duration_; }
+  BluetoothAdapter* GetAdapter(BluetoothAdapter::Observer* observer);
 
   // Sets a new BluetoothAdapter to be returned by GetAdapter. When setting
   // a new adapter all observers from the old adapter are removed and added
   // to |mock_adapter|.
   void SetBluetoothAdapterForTesting(
-      scoped_refptr<device::BluetoothAdapter> mock_adapter);
+      scoped_refptr<BluetoothAdapter> mock_adapter);
 
  private:
+  // friend LazyInstance to permit access to private constructor.
+  friend base::DefaultLazyInstanceTraits<BluetoothAdapterFactoryWrapper>;
+
+  BluetoothAdapterFactoryWrapper();
+
   void OnGetAdapter(const AcquireAdapterCallback& continuation,
-                    scoped_refptr<device::BluetoothAdapter> adapter);
+                    scoped_refptr<BluetoothAdapter> adapter);
 
-  bool HasAdapter(device::BluetoothAdapter::Observer* observer);
-  void AddAdapterObserver(device::BluetoothAdapter::Observer* observer);
-  void RemoveAdapterObserver(device::BluetoothAdapter::Observer* observer);
+  bool HasAdapter(BluetoothAdapter::Observer* observer);
+  void AddAdapterObserver(BluetoothAdapter::Observer* observer);
+  void RemoveAdapterObserver(BluetoothAdapter::Observer* observer);
 
   // Sets |adapter_| to a BluetoothAdapter instance and register observers,
   // releasing references to previous |adapter_|.
-  void set_adapter(scoped_refptr<device::BluetoothAdapter> adapter);
+  void set_adapter(scoped_refptr<BluetoothAdapter> adapter);
 
   // A BluetoothAdapter instance representing an adapter of the system.
-  scoped_refptr<device::BluetoothAdapter> adapter_;
+  scoped_refptr<BluetoothAdapter> adapter_;
 
   // We keep a list of all observers so that when the adapter gets swapped,
   // we can remove all observers from the old adapter and add them to the
   // new adapter.
-  std::unordered_set<device::BluetoothAdapter::Observer*> adapter_observers_;
-
-  // This is 0 if SetBluetoothAdapterForTesting has been called.
-  base::TimeDelta scan_duration_;
-
-  bool testing_;
+  std::unordered_set<BluetoothAdapter::Observer*> adapter_observers_;
 
   // Weak pointer factory for generating 'this' pointers that might live longer
   // than we do.
@@ -94,6 +87,6 @@ class CONTENT_EXPORT BluetoothAdapterFactoryWrapper final {
   DISALLOW_COPY_AND_ASSIGN(BluetoothAdapterFactoryWrapper);
 };
 
-}  // namespace content
+}  // namespace device
 
-#endif  // CONTENT_BROWSER_BLUETOOTH_BLUETOOTH_ADAPTER_FACTORY_WRAPPER_H_
+#endif  // DEVICE_BLUETOOTH_BLUETOOTH_ADAPTER_FACTORY_WRAPPER_H_