Revert of Hook up ProximityAuthSystem in EasyUnlockService.

components/proximity_auth/unlock_manager.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_UNLOCK_MANAGER_H
 #define COMPONENTS_PROXIMITY_AUTH_UNLOCK_MANAGER_H
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
@@ skipping 44 matching lines @@
   bool IsUnlockAllowed();
 
   // Sets the |life_cycle| of the rmeote device to which local events are
   // dispatched. A null |life_cycle| indicates that proximity-based
   // authentication is inactive.
   void SetRemoteDeviceLifeCycle(RemoteDeviceLifeCycle* life_cycle);
 
   // Called when the life cycle's state changes.
   void OnLifeCycleStateChanged();
 
+ protected:
   // Called when the user pod is clicked for an authentication attempt of type
   // |auth_type|.
   // Exposed for testing.
   void OnAuthAttempted(ScreenlockBridge::LockHandler::AuthType auth_type);
 
  private:
   // The possible lock screen states for the remote device.
   enum class RemoteScreenlockState {
     UNKNOWN,
     UNLOCKED,
@@ skipping 52 matching lines @@
 
   // Accepts or rejects the current auth attempt according to |should_accept|.
   // If the auth attempt is accepted, unlocks the screen.
   void AcceptAuthAttempt(bool should_accept);
 
   // Returns the screen lock state corresponding to the given remote |status|
   // update.
   RemoteScreenlockState GetScreenlockStateFromRemoteUpdate(
       RemoteStatusUpdate update);
 
-  // Returns the Messenger instance associated with |life_cycle_|. This function
-  // will return nullptr if |life_cycle_| is not set or the remote device is not
-  // yet authenticated.
-  Messenger* GetMessenger();
-
   // Whether |this| manager is being used for sign-in or session unlock.
   const ScreenlockType screenlock_type_;
 
   // Whether the user is present at the remote device. Unset if no remote status
   // update has yet been received.
   scoped_ptr<RemoteScreenlockState> remote_screenlock_state_;
 
   // Controls the proximity auth flow logic for a remote device. Not owned, and
   // expcted to outlive |this| instance.
   RemoteDeviceLifeCycle* life_cycle_;
 
+  // The messenger used to communicate with the remote device once a secure
+  // channel
+  // is established. Null if no secure channel has been established yet. Not
+  // owned, and expected to outlive |this| instance.
+  Messenger* messenger_;
+
   // Tracks whether the remote device is currently in close enough proximity to
   // the local device to allow unlocking.
   scoped_ptr<ProximityMonitor> proximity_monitor_;
 
   // Used to call into the embedder. Expected to outlive |this| instance.
   ProximityAuthClient* proximity_auth_client_;
 
   // Whether the screen is currently locked.
   bool is_locked_;
 
@@ skipping 25 matching lines @@
 
   // Used to vend all other weak pointers.
   base::WeakPtrFactory<UnlockManager> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(UnlockManager);
 };
 
 }  // namespace proximity_auth
 
 #endif  // COMPONENTS_PROXIMITY_AUTH_UNLOCK_MANAGER_H