Revert of Hook up ProximityAuthSystem in EasyUnlockService.

components/proximity_auth/unlock_manager_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/unlock_manager.h"
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/test/test_simple_task_runner.h"
@@ skipping 71 matching lines @@
     ON_CALL(*this, IsInRssiRange()).WillByDefault(Return(false));
   }
   ~MockProximityMonitor() override {}
 
   MOCK_METHOD0(Start, void());
   MOCK_METHOD0(Stop, void());
   MOCK_CONST_METHOD0(GetStrategy, Strategy());
   MOCK_CONST_METHOD0(IsUnlockAllowed, bool());
   MOCK_CONST_METHOD0(IsInRssiRange, bool());
   MOCK_METHOD0(RecordProximityMetricsOnAuthSuccess, void());
-  MOCK_METHOD1(AddObserver, void(ProximityMonitorObserver*));
-  MOCK_METHOD1(RemoveObserver, void(ProximityMonitorObserver*));
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockProximityMonitor);
 };
 
 class FakeLockHandler : public ScreenlockBridge::LockHandler {
  public:
   FakeLockHandler() {}
   ~FakeLockHandler() override {}
 
@@ skipping 354 matching lines @@
   EXPECT_CALL(*proximity_monitor_, Stop()).Times(AtLeast(1));
   unlock_manager_->SetRemoteDeviceLifeCycle(nullptr);
 }
 
 TEST_F(
     ProximityAuthUnlockManagerTest,
     SetRemoteDeviceLifeCycle_ConnectingRemoteDeviceLifeCycle_StopsProximityMonitor) {
   CreateUnlockManager(UnlockManager::ScreenlockType::SESSION_LOCK);
   SimulateUserPresentState();
 
-  ON_CALL(life_cycle_, GetState())
+  NiceMock<MockRemoteDeviceLifeCycle> life_cycle;
+  ON_CALL(life_cycle, GetState())
       .WillByDefault(Return(RemoteDeviceLifeCycle::State::FINDING_CONNECTION));
 
   EXPECT_CALL(*proximity_monitor_, Stop()).Times(AtLeast(1));
-  unlock_manager_->SetRemoteDeviceLifeCycle(&life_cycle_);
+  unlock_manager_->SetRemoteDeviceLifeCycle(&life_cycle);
 }
 
 TEST_F(
     ProximityAuthUnlockManagerTest,
     SetRemoteDeviceLifeCycle_ConnectedRemoteDeviceLifeCycle_StartsProximityMonitor) {
   CreateUnlockManager(UnlockManager::ScreenlockType::SESSION_LOCK);
   SimulateUserPresentState();
 
-  ON_CALL(life_cycle_, GetState())
+  NiceMock<MockRemoteDeviceLifeCycle> life_cycle;
+  ON_CALL(life_cycle, GetState())
       .WillByDefault(
           Return(RemoteDeviceLifeCycle::State::SECURE_CHANNEL_ESTABLISHED));
 
   EXPECT_CALL(*proximity_monitor_, Start()).Times(AtLeast(1));
-  unlock_manager_->SetRemoteDeviceLifeCycle(&life_cycle_);
+  unlock_manager_->SetRemoteDeviceLifeCycle(&life_cycle);
 }
 
 TEST_F(ProximityAuthUnlockManagerTest,
        OnLifeCycleStateChanged_SecureChannelEstablished_RegistersAsObserver) {
   CreateUnlockManager(UnlockManager::ScreenlockType::SESSION_LOCK);
   SimulateUserPresentState();
+
+  NiceMock<MockRemoteDeviceLifeCycle> life_cycle;
+  ON_CALL(life_cycle, GetState())
+      .WillByDefault(
+          Return(RemoteDeviceLifeCycle::State::SECURE_CHANNEL_ESTABLISHED));
+
   EXPECT_CALL(messenger_, AddObserver(unlock_manager_.get()));
   unlock_manager_->OnLifeCycleStateChanged();
 }
 
 TEST_F(ProximityAuthUnlockManagerTest,
        OnLifeCycleStateChanged_StartsProximityMonitor) {
   CreateUnlockManager(UnlockManager::ScreenlockType::SESSION_LOCK);
   SimulateUserPresentState();
+
+  NiceMock<MockRemoteDeviceLifeCycle> life_cycle;
+  ON_CALL(life_cycle, GetState())
+      .WillByDefault(
+          Return(RemoteDeviceLifeCycle::State::SECURE_CHANNEL_ESTABLISHED));
+
   EXPECT_CALL(*proximity_monitor_, Start()).Times(AtLeast(1));
   unlock_manager_->OnLifeCycleStateChanged();
 }
 
 TEST_F(ProximityAuthUnlockManagerTest,
        OnLifeCycleStateChanged_StopsProximityMonitor) {
   CreateUnlockManager(UnlockManager::ScreenlockType::SESSION_LOCK);
   SimulateUserPresentState();
 
   ON_CALL(life_cycle_, GetState())
@@ skipping 82 matching lines @@
 }
 
 TEST_F(ProximityAuthUnlockManagerTest, OnDisconnected_UnregistersAsObserver) {
   CreateUnlockManager(UnlockManager::ScreenlockType::SESSION_LOCK);
   SimulateUserPresentState();
 
   ON_CALL(life_cycle_, GetState())
       .WillByDefault(
           Return(RemoteDeviceLifeCycle::State::AUTHENTICATION_FAILED));
 
-  EXPECT_CALL(messenger_, RemoveObserver(unlock_manager_.get()))
-      .Times(testing::AtLeast(1));
+  EXPECT_CALL(messenger_, RemoveObserver(unlock_manager_.get()));
   unlock_manager_.get()->OnDisconnected();
-  unlock_manager_->SetRemoteDeviceLifeCycle(nullptr);
 }
 
 TEST_F(ProximityAuthUnlockManagerTest,
        OnScreenDidUnlock_StopsProximityMonitor) {
   CreateUnlockManager(UnlockManager::ScreenlockType::SESSION_LOCK);
   SimulateUserPresentState();
 
   EXPECT_CALL(*proximity_monitor_, Stop());
   unlock_manager_.get()->OnScreenDidUnlock(
       ScreenlockBridge::LockHandler::LOCK_SCREEN);
@@ skipping 192 matching lines @@
   SimulateUserPresentState();
 
   EXPECT_CALL(messenger_, DispatchUnlockEvent());
   unlock_manager_->OnAuthAttempted(ScreenlockBridge::LockHandler::USER_CLICK);
 
   EXPECT_CALL(proximity_auth_client_, FinalizeUnlock(true));
   unlock_manager_->OnUnlockEventSent(true);
 }
 
 }  // namespace proximity_auth