Revert of Hook up ProximityAuthSystem in EasyUnlockService.

components/proximity_auth/proximity_monitor_impl.h

 // Copyright 2015 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.
 
 #ifndef COMPONENTS_PROXIMITY_AUTH_PROXIMITY_MONITOR_IMPL_H
 #define COMPONENTS_PROXIMITY_AUTH_PROXIMITY_MONITOR_IMPL_H
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
-#include "base/observer_list.h"
 #include "components/proximity_auth/proximity_monitor.h"
 #include "components/proximity_auth/remote_device.h"
 #include "device/bluetooth/bluetooth_device.h"
 
 namespace base {
 class TickClock;
 class TimeTicks;
 }
 
 namespace device {
 class BluetoothAdapter;
 }
 
 namespace proximity_auth {
 
 class ProximityMonitorObserver;
 
 // The concrete implemenation of the proximity monitor interface.
 class ProximityMonitorImpl : public ProximityMonitor {
  public:
   // The |observer| is not owned, and must outlive |this| instance.
   ProximityMonitorImpl(const RemoteDevice& remote_device,
-                       scoped_ptr<base::TickClock> clock);
+                       scoped_ptr<base::TickClock> clock,
+                       ProximityMonitorObserver* observer);
   ~ProximityMonitorImpl() override;
 
   // ProximityMonitor:
   void Start() override;
   void Stop() override;
   Strategy GetStrategy() const override;
   bool IsUnlockAllowed() const override;
   bool IsInRssiRange() const override;
   void RecordProximityMetricsOnAuthSuccess() override;
-  void AddObserver(ProximityMonitorObserver* observer) override;
-  void RemoveObserver(ProximityMonitorObserver* observer) override;
 
  protected:
   // Sets the proximity detection strategy. Exposed for testing.
   // TODO(isherman): Stop exposing this for testing once prefs are properly
   // hooked up.
   virtual void SetStrategy(Strategy strategy);
 
  private:
   struct TransmitPowerReading {
     TransmitPowerReading(int transmit_power, int max_transmit_power);
@@ skipping 35 matching lines @@
   // Resets the proximity state to |false|, and clears all member variables
   // tracking the proximity state.
   void ClearProximityState();
 
   // Updates the proximity state with a new |connection_info| sample of the
   // current RSSI and Tx power, and the device's maximum Tx power.
   void AddSample(
       const device::BluetoothDevice::ConnectionInfo& connection_info);
 
   // Checks whether the proximity state has changed based on the current
-  // samples. Notifies |observers_| on a change.
+  // samples. Notifies the |observer_| on a change.
   void CheckForProximityStateChange();
 
-  // The remote device being monitored.
   const RemoteDevice remote_device_;
 
-  // The observers attached to the ProximityMonitor.
-  base::ObserverList<ProximityMonitorObserver> observers_;
+  // The |observer_| is not owned, and must outlive |this| instance.
+  ProximityMonitorObserver* observer_;
 
   // The Bluetooth adapter that will be polled for connection info.
   scoped_refptr<device::BluetoothAdapter> bluetooth_adapter_;
 
   // The strategy used to determine whether the remote device is in proximity.
   Strategy strategy_;
 
   // Whether the remote device is currently in close proximity to the local
   // device.
   bool remote_device_is_in_proximity_;
@@ skipping 30 matching lines @@
 
   // Used to vend all other weak pointers.
   base::WeakPtrFactory<ProximityMonitorImpl> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ProximityMonitorImpl);
 };
 
 }  // namespace proximity_auth
 
 #endif  // COMPONENTS_PROXIMITY_AUTH_PROXIMITY_MONITOR_IMPL_H