Clean up Smart Lock cryptohome keys logic:

chrome/browser/chromeos/login/session/user_session_manager.cc

 // 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.
 
 #include "chrome/browser/chromeos/login/session/user_session_manager.h"
 
 #include <string>
 
 #include "base/base_paths.h"
 #include "base/bind.h"
@@ skipping 1281 matching lines @@
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
   user_sessions_restored_ = true;
   user_sessions_restore_in_progress_ = false;
   FOR_EACH_OBSERVER(chromeos::UserSessionStateObserver,
                     session_state_observer_list_,
                     PendingUserSessionsRestoreFinished());
 }
 
 void UserSessionManager::UpdateEasyUnlockKeys(const UserContext& user_context) {
   // Skip key update because FakeCryptohomeClient always return success
-  // and RemoveKey op expects a failure to stop. As a result, some tests would
+  // and RefreshKeys op expects a failure to stop. As a result, some tests would
   // timeout.
   // TODO(xiyuan): Revisit this when adding tests.
   if (!base::SysInfo::IsRunningOnChromeOS())
     return;
 
   // Only update Easy unlock keys for regular user.
   // TODO(xiyuan): Fix inconsistency user type of |user_context| introduced in
   // authenticator.
   const user_manager::User* user =
       user_manager::UserManager::Get()->FindUser(user_context.GetUserID());
   if (!user || !user->HasGaiaAccount())
     return;
 
   // Bail if |user_context| does not have secret.
   if (user_context.GetKey()->GetSecret().empty())
     return;
 
   const base::ListValue* device_list = NULL;
   EasyUnlockService* easy_unlock_service = EasyUnlockService::GetForUser(*user);
   if (easy_unlock_service) {
     device_list = easy_unlock_service->GetRemoteDevices();
     easy_unlock_service->SetHardlockState(
         EasyUnlockScreenlockStateHandler::NO_HARDLOCK);
   }
 
+  base::ListValue empty_list;
+  if (!device_list)
+    device_list = &empty_list;
+
   EasyUnlockKeyManager* key_manager = GetEasyUnlockKeyManager();
   running_easy_unlock_key_ops_ = true;
-  if (device_list) {
-    key_manager->RefreshKeys(
-        user_context,
-        *device_list,
-        base::Bind(&UserSessionManager::OnEasyUnlockKeyOpsFinished,
-                   AsWeakPtr(),
-                   user_context.GetUserID()));
-  } else {
-    key_manager->RemoveKeys(
-        user_context,
-        0,
-        base::Bind(&UserSessionManager::OnEasyUnlockKeyOpsFinished,
-                   AsWeakPtr(),
-                   user_context.GetUserID()));
-  }
+  key_manager->RefreshKeys(
+      user_context, *device_list,
+      base::Bind(&UserSessionManager::OnEasyUnlockKeyOpsFinished, AsWeakPtr(),
+                 user_context.GetUserID()));
 }
 
 void UserSessionManager::AttemptRestart(Profile* profile) {
   if (CheckEasyUnlockKeyOps(base::Bind(&UserSessionManager::AttemptRestart,
                                        AsWeakPtr(), profile))) {
     return;
   }
 
   if (session_restore_strategy_ !=
       OAuth2LoginManager::RESTORE_FROM_COOKIE_JAR) {
@@ skipping 144 matching lines @@
     InputEventsBlocker* /* input_events_blocker */,
     const locale_util::LanguageSwitchResult& /* result */) {
   callback.Run();
 }
 
 void UserSessionManager::RemoveProfileForTesting(Profile* profile) {
   default_ime_states_.erase(profile);
 }
 
 }  // namespace chromeos