Move CBCentralManager from the Discovery Manager to Adapter

device/bluetooth/bluetooth_low_energy_discovery_manager_mac.h

Index: device/bluetooth/bluetooth_low_energy_discovery_manager_mac.h
diff --git a/device/bluetooth/bluetooth_low_energy_discovery_manager_mac.h b/device/bluetooth/bluetooth_low_energy_discovery_manager_mac.h
index 84b2cfe024f136373b34ae5d51d568c7bb9258b7..cef82b5b4633e581dc6c211819bef96126c5b07d 100644
--- a/device/bluetooth/bluetooth_low_energy_discovery_manager_mac.h
+++ b/device/bluetooth/bluetooth_low_energy_discovery_manager_mac.h
@@ -15,13 +15,8 @@
 #include "base/mac/sdk_forward_declarations.h"
 #include "device/bluetooth/bluetooth_device.h"
 
-@class BluetoothLowEnergyDiscoveryManagerMacBridge;
-
 namespace device {
 
-class BluetoothLowEnergyDeviceMac;
-class BluetoothLowEnergyDiscoveryManagerMacDelegate;
-
 // This class will scan for Bluetooth LE device on Mac.
 class BluetoothLowEnergyDiscoveryManagerMac {
  public:
@@ -53,6 +48,8 @@ class BluetoothLowEnergyDiscoveryManagerMac {
   // Returns a new BluetoothLowEnergyDiscoveryManagerMac.
   static BluetoothLowEnergyDiscoveryManagerMac* Create(Observer* observer);
 
+  virtual void SetCentralManager(CBCentralManager* central_manager);
+
  protected:
   // Called when a discovery or an update of a BLE device occurred.
   virtual void DiscoveredPeripheral(CBPeripheral* peripheral,
@@ -69,19 +66,14 @@ class BluetoothLowEnergyDiscoveryManagerMac {
  private:
   explicit BluetoothLowEnergyDiscoveryManagerMac(Observer* observer);
 
-  // Private method for testing.  Resets |manager_| to |manager| and set
-  // |bridge_| as its delegate.  Only for use on OSX 10.7 or later, where
-  // CoreBluetooth is available.
-  virtual void SetManagerForTesting(CBCentralManager* manager);
-
-  friend class BluetoothLowEnergyDiscoveryManagerMacDelegate;
   friend class BluetoothAdapterMacTest;
+  friend class BluetoothLowEnergyCentralManagerBridge;
 
   // Observer interested in notifications from us.
   Observer* observer_;
 
-  // Underlying CoreBluetooth central manager.
-  base::scoped_nsobject<CBCentralManager> manager_;
+  // Underlying CoreBluetooth central manager, owned by |observer_|.
+  CBCentralManager* central_manager_ = nil;
 
   // Discovery has been initiated by calling the API StartDiscovery().
   bool discovering_;
@@ -90,9 +82,6 @@ class BluetoothLowEnergyDiscoveryManagerMac {
   // waiting for Bluetooth to turn on.
   bool pending_;
 
-  // Delegate of the central manager.
-  base::scoped_nsobject<BluetoothLowEnergyDiscoveryManagerMacBridge> bridge_;
-
   // List of service UUIDs to scan.
   BluetoothDevice::UUIDList services_uuids_;