Revert of Revert of Clean up Smart Lock cryptohome keys logic:

chrome/browser/signin/easy_unlock_service_regular.h

 // Copyright 2014 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 CHROME_BROWSER_SIGNIN_EASY_UNLOCK_SERVICE_REGULAR_H_
 #define CHROME_BROWSER_SIGNIN_EASY_UNLOCK_SERVICE_REGULAR_H_
 
 #include <string>
 
 #include "base/macros.h"
@@ skipping 23 matching lines @@
  private:
   // EasyUnlockService implementation.
   EasyUnlockService::Type GetType() const override;
   std::string GetUserEmail() const override;
   void LaunchSetup() override;
   const base::DictionaryValue* GetPermitAccess() const override;
   void SetPermitAccess(const base::DictionaryValue& permit) override;
   void ClearPermitAccess() override;
   const base::ListValue* GetRemoteDevices() const override;
   void SetRemoteDevices(const base::ListValue& devices) override;
-  void ClearRemoteDevices() override;
   void RunTurnOffFlow() override;
   void ResetTurnOffFlow() override;
   TurnOffFlowStatus GetTurnOffFlowStatus() const override;
   std::string GetChallenge() const override;
   std::string GetWrappedSecret() const override;
   void RecordEasySignInOutcome(const std::string& user_id,
                                bool success) const override;
   void RecordPasswordLoginEvent(const std::string& user_id) const override;
   void InitializeInternal() override;
   void ShutdownInternal() override;
   bool IsAllowedInternal() override;
 
   // Opens the component packaged app responsible for setting up Smart Lock.
   void OpenSetupApp();
 
   // Callback when the controlling pref changes.
   void OnPrefsChanged();
 
   // Sets the new turn-off flow status.
   void SetTurnOffFlowStatus(TurnOffFlowStatus status);
 
   // Callback invoked when turn off flow has finished.
   void OnTurnOffFlowFinished(bool success);
 
 #if defined(OS_CHROMEOS)
+  // Called with the user's credentials (e.g. username and password) after the
+  // user reauthenticates to begin setup.
   void OnUserContextFromReauth(const chromeos::UserContext& user_context);
-  void OnKeysRefreshedForSetDevices(bool success);
+
+  // Called after a cryptohome RemoveKey or RefreshKey operation to set the
+  // proper hardlock state if the operation is successful.
+  void SetHardlockAfterKeyOperation(
+      EasyUnlockScreenlockStateHandler::HardlockState state_on_success,
+      bool success);
 
   scoped_ptr<chromeos::ShortLivedUserContext> short_lived_user_context_;
 #endif
 
   PrefChangeRegistrar registrar_;
 
   TurnOffFlowStatus turn_off_flow_status_;
   scoped_ptr<EasyUnlockToggleFlow> turn_off_flow_;
 
   base::WeakPtrFactory<EasyUnlockServiceRegular> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(EasyUnlockServiceRegular);
 };
 
 #endif  // CHROME_BROWSER_SIGNIN_EASY_UNLOCK_SERVICE_REGULAR_H_