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

chrome/browser/chromeos/login/user_manager_impl.h

 // Copyright (c) 2012 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_CHROMEOS_LOGIN_USER_MANAGER_IMPL_H_
 #define CHROME_BROWSER_CHROMEOS_LOGIN_USER_MANAGER_IMPL_H_
 #pragma once
 
 #include <string>
 
@@ skipping 51 matching lines @@
       const std::string& username) const OVERRIDE;
   virtual void SaveUserDefaultImageIndex(const std::string& username,
                                          int image_index) OVERRIDE;
   virtual void SaveUserImage(const std::string& username,
                              const SkBitmap& image) OVERRIDE;
   virtual void SaveUserImageFromFile(const std::string& username,
                                      const FilePath& path) OVERRIDE;
   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;
   virtual bool IsLoggedInAsDemoUser() const OVERRIDE;
   virtual bool IsLoggedInAsGuest() const OVERRIDE;
   virtual void AddObserver(Observer* obs) OVERRIDE;
   virtual void RemoveObserver(Observer* obs) OVERRIDE;
   virtual void NotifyLocalStateChanged() OVERRIDE;
   virtual const SkBitmap& DownloadedProfileImage() const OVERRIDE;
 
@@ skipping 117 matching lines @@
   bool is_current_user_owner_;
   mutable base::Lock is_current_user_owner_lock_;
 
   // Cached flag of whether the currently logged-in user existed before this
   // login.
   bool is_current_user_new_;
 
   // 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
   // errors appear. NOTE: there is no guarantee that it is the current sync
   // service, so do NOT use it outside |OnStateChanged| method.
   ProfileSyncService* observed_sync_service_;
 
   ObserverList<Observer> observer_list_;
 
   // Download user profile image on login to update it if it's changed.
@@ skipping 15 matching lines @@
 
   // Data URL for |downloaded_profile_image_|.
   std::string downloaded_profile_image_data_url_;
 
   DISALLOW_COPY_AND_ASSIGN(UserManagerImpl);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_USER_MANAGER_IMPL_H_