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

chrome/browser/signin/easy_unlock_service_regular.h

Index: chrome/browser/signin/easy_unlock_service_regular.h
diff --git a/chrome/browser/signin/easy_unlock_service_regular.h b/chrome/browser/signin/easy_unlock_service_regular.h
index 3a48585bdc918d383b91f8ee1700277e707fe343..d983cae0dbb796a22b6cd5e5f97918c4fbb4d021 100644
--- a/chrome/browser/signin/easy_unlock_service_regular.h
+++ b/chrome/browser/signin/easy_unlock_service_regular.h
@@ -41,7 +41,6 @@
   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;
@@ -67,8 +66,15 @@
   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