Make sure the device recovers from policy loss in the consumer case.

chrome/browser/chromeos/login/user_manager_impl.h

Index: chrome/browser/chromeos/login/user_manager_impl.h
diff --git a/chrome/browser/chromeos/login/user_manager_impl.h b/chrome/browser/chromeos/login/user_manager_impl.h
index 1abfdcc7c55a6f9f443a012aba108ed8d83db561..4d94283576a4f08bbf13aefb95da63b4c1296ace 100644
--- a/chrome/browser/chromeos/login/user_manager_impl.h
+++ b/chrome/browser/chromeos/login/user_manager_impl.h
@@ -69,6 +69,7 @@ class UserManagerImpl : public UserManager,
   virtual void SaveUserImageFromProfileImage(
       const std::string& username) OVERRIDE;
   virtual void DownloadProfileImage(const std::string& reason) OVERRIDE;
+  virtual void LoadKeyStore() OVERRIDE;
   virtual bool IsCurrentUserOwner() const OVERRIDE;
   virtual bool IsCurrentUserNew() const OVERRIDE;
   virtual bool IsUserLoggedIn() const OVERRIDE;
@@ -206,6 +207,11 @@ class UserManagerImpl : public UserManager,
   // Cached flag of whether any user is logged in at the moment.
   bool is_user_logged_in_;
 
+  // The key store for the current user has been loaded. This flag is needed to
+  // ensure that the key store will not be loaded twice in the policy recovery
+  // "safe-mode".
+  bool key_store_loaded_;
+
   content::NotificationRegistrar registrar_;
 
   // Profile sync service which is observed to take actions after sync