Load DeviceLocalAccount policy and DeviceSettings immediately on restore after Chrome crash.

chrome/browser/chromeos/settings/session_manager_operation.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_SETTINGS_SESSION_MANAGER_OPERATION_H_
 #define CHROME_BROWSER_CHROMEOS_SETTINGS_SESSION_MANAGER_OPERATION_H_
 
 #include <memory>
 
 #include "base/callback.h"
@@ skipping 56 matching lines @@
  protected:
   // Runs the operation. The result is reported through |callback_|.
   virtual void Run() = 0;
 
   // Ensures the public key is loaded.
   void EnsurePublicKey(const base::Closure& callback);
 
   // Starts a load operation.
   void StartLoading();
 
+  // Synchronous load operation.
+  void LoadImmediately();
+
   // Reports the result status of the operation. Once this gets called, the
   // operation should not perform further processing or trigger callbacks.
   void ReportResult(DeviceSettingsService::Status status);
 
   SessionManagerClient* session_manager_client() {
     return session_manager_client_;
   }
 
   // Whether to verify the loaded policy's signature against |public_key_| and
   // perform other cloud-specific validations.  (Active Directory policy has no
   // signature that could be verified.)
   bool cloud_validations_ = true;
 
   bool force_key_load_ = false;
 
+  bool force_immediate_load_ = false;
+
  private:
   // Loads the owner key from disk. Must be run on a thread that can do I/O.
   static scoped_refptr<ownership::PublicKey> LoadPublicKey(
       scoped_refptr<ownership::OwnerKeyUtil> util,
       scoped_refptr<ownership::PublicKey> current_key);
 
   // Stores the owner key loaded by LoadOwnerKey and calls |callback|.
   void StorePublicKey(const base::Closure& callback,
                       scoped_refptr<ownership::PublicKey> new_key);
 
   // Triggers a device settings load.
   void RetrieveDeviceSettings();
 
+  // Same as RetrieveDeviceSettings, but loads synchronously.
+  void BlockingRetrieveDeviceSettings();
+
   // Validates device settings after retrieval from session_manager.
   void ValidateDeviceSettings(const std::string& policy_blob);
 
   // Extracts status and device settings from the validator and reports them.
   void ReportValidatorStatus(policy::DeviceCloudPolicyValidator* validator);
 
   SessionManagerClient* session_manager_client_ = nullptr;
   scoped_refptr<ownership::OwnerKeyUtil> owner_key_util_;
 
   Callback callback_;
 
   scoped_refptr<ownership::PublicKey> public_key_;
 
   bool is_loading_ = false;
   std::unique_ptr<enterprise_management::PolicyData> policy_data_;
   std::unique_ptr<enterprise_management::ChromeDeviceSettingsProto>
       device_settings_;
 
   base::WeakPtrFactory<SessionManagerOperation> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(SessionManagerOperation);
 };
 
 // This operation loads the public owner key from disk if appropriate, fetches
 // the policy blob from session manager, and validates the loaded policy blob.
 class LoadSettingsOperation : public SessionManagerOperation {
  public:
   // Creates a new load operation.  If |cloud_validations| is true, signature
   // validation and other cloud-specific checks are performed.
+  // If |force_immediate_load| is true, load happens synchronously on Run()
+  // call.
   LoadSettingsOperation(bool force_key_load,
                         bool cloud_validations,
+                        bool force_immediate_load,
                         const Callback& callback);
   ~LoadSettingsOperation() override;
 
  protected:
   // SessionManagerOperation:
   void Run() override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(LoadSettingsOperation);
 };
@@ skipping 19 matching lines @@
   std::unique_ptr<enterprise_management::PolicyFetchResponse> policy_;
 
   base::WeakPtrFactory<StoreSettingsOperation> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(StoreSettingsOperation);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_SETTINGS_SESSION_MANAGER_OPERATION_H_