Merge "cros: Hide banner on NeedsDircryptoMigration call failure"

chrome/browser/chromeos/login/screens/user_selection_screen.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/screens/user_selection_screen.h"
 
 #include <stddef.h>
 
 #include <utility>
 
@@ skipping 182 matching lines @@
                    weak_ptr_factory_.GetWeakPtr(), account_id));
   }
 
   // Callback invoked when NeedsDircryptoMigration call is finished.
   void OnCryptohomeNeedsDircryptoMigrationCallback(
       const AccountId& account_id,
       DBusMethodCallStatus call_status,
       bool needs_migration) {
     if (call_status != DBUS_METHOD_CALL_SUCCESS) {
       LOG(ERROR) << "Failed to call cryptohome NeedsDircryptoMigration.";
+      // Hide the banner to avoid confusion in http://crbug.com/721948.
+      // Cache is not updated so that cryptohome call will still be attempted.
+      UpdateUI(account_id, false);
       return;
     }
 
     needs_dircrypto_migration_cache_[account_id] = needs_migration;
     UpdateUI(account_id, needs_migration);
   }
 
   // Update UI for the given user when the check result is available.
   void UpdateUI(const AccountId& account_id, bool needs_migration) {
     // Bail if the user is not the currently focused.
@@ skipping 478 matching lines @@
   // The user profile should exist if and only if this is the lock screen.
   DCHECK_EQ(!!profile, GetScreenType() == LOCK_SCREEN);
 
   if (!profile)
     profile = profile_helper->GetSigninProfile();
 
   return EasyUnlockService::Get(profile);
 }
 
 }  // namespace chromeos