Revert of Hook up ProximityAuthSystem in EasyUnlockService.

components/proximity_auth/proximity_monitor_impl_unittest.cc

 // 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.
 
 #include "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/test/histogram_tester.h"
@@ skipping 20 matching lines @@
 
 const char kRemoteDeviceUserId[] = "example@gmail.com";
 const char kBluetoothAddress[] = "AA:BB:CC:DD:EE:FF";
 const char kRemoteDevicePublicKey[] = "Remote Public Key";
 const char kRemoteDeviceName[] = "LGE Nexus 5";
 const char kPersistentSymmetricKey[] = "PSK";
 
 class TestProximityMonitorImpl : public ProximityMonitorImpl {
  public:
   explicit TestProximityMonitorImpl(const RemoteDevice& remote_device,
-                                    scoped_ptr<base::TickClock> clock)
-      : ProximityMonitorImpl(remote_device, clock.Pass()) {}
+                                    scoped_ptr<base::TickClock> clock,
+                                    ProximityMonitorObserver* observer)
+      : ProximityMonitorImpl(remote_device, clock.Pass(), observer) {}
   ~TestProximityMonitorImpl() override {}
 
   using ProximityMonitorImpl::SetStrategy;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TestProximityMonitorImpl);
 };
 
 class MockProximityMonitorObserver : public ProximityMonitorObserver {
  public:
@@ skipping 29 matching lines @@
                                  kBluetoothAddress,
                                  false /* paired */,
                                  true /* connected */),
         monitor_(RemoteDevice(kRemoteDeviceUserId,
                               kRemoteDeviceName,
                               kRemoteDevicePublicKey,
                               RemoteDevice::BLUETOOTH_CLASSIC,
                               kBluetoothAddress,
                               kPersistentSymmetricKey,
                               std::string()),
-                 make_scoped_ptr(clock_)),
+                 make_scoped_ptr(clock_),
+                 &observer_),
         task_runner_(new base::TestSimpleTaskRunner()),
         thread_task_runner_handle_(task_runner_) {
     ON_CALL(*bluetooth_adapter_, GetDevice(kBluetoothAddress))
         .WillByDefault(Return(&remote_bluetooth_device_));
     ON_CALL(remote_bluetooth_device_, GetConnectionInfo(_))
         .WillByDefault(SaveArg<0>(&connection_info_callback_));
-    monitor_.AddObserver(&observer_);
   }
   ~ProximityAuthProximityMonitorImplTest() override {}
 
   void RunPendingTasks() { task_runner_->RunPendingTasks(); }
 
   void ProvideConnectionInfo(
       const BluetoothDevice::ConnectionInfo& connection_info) {
     RunPendingTasks();
     connection_info_callback_.Run(connection_info);
 
@@ skipping 426 matching lines @@
 TEST_F(ProximityAuthProximityMonitorImplTest,
        RecordProximityMetricsOnAuthSuccess_UnknownValues) {
   // Note: A device without a recorded name will have its Bluetooth address as
   // its name.
   RemoteDevice unnamed_remote_device(
       kRemoteDeviceUserId, kBluetoothAddress, kRemoteDevicePublicKey,
       RemoteDevice::BLUETOOTH_CLASSIC, kBluetoothAddress,
       kPersistentSymmetricKey, std::string());
 
   scoped_ptr<base::TickClock> clock(new base::SimpleTestTickClock());
-  ProximityMonitorImpl monitor(unnamed_remote_device, clock.Pass());
-  monitor.AddObserver(&observer_);
+  ProximityMonitorImpl monitor(unnamed_remote_device, clock.Pass(), &observer_);
   monitor.Start();
   ProvideConnectionInfo({127, 127, 127});
 
   base::HistogramTester histogram_tester;
   monitor.RecordProximityMetricsOnAuthSuccess();
   histogram_tester.ExpectUniqueSample("EasyUnlock.AuthProximity.RollingRssi",
                                       127, 1);
   histogram_tester.ExpectUniqueSample(
       "EasyUnlock.AuthProximity.TransmitPowerDelta", 127, 1);
   histogram_tester.ExpectUniqueSample(
       "EasyUnlock.AuthProximity.TimeSinceLastZeroRssi",
       base::TimeDelta::FromSeconds(10).InMilliseconds(), 1);
   histogram_tester.ExpectUniqueSample(
       "EasyUnlock.AuthProximity.RemoteDeviceModelHash",
       -1808066424 /* hash of "Unknown" */, 1);
 }
 
 }  // namespace proximity_auth