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

chrome/browser/chromeos/settings/session_manager_operation.cc

 // 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.
 
 #include "chrome/browser/chromeos/settings/session_manager_operation.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 52 matching lines @@
     return;
   is_loading_ = true;
   if (cloud_validations_) {
     EnsurePublicKey(base::Bind(&SessionManagerOperation::RetrieveDeviceSettings,
                                weak_factory_.GetWeakPtr()));
   } else {
     RetrieveDeviceSettings();
   }
 }
 
+void SessionManagerOperation::LoadImmediately() {
+  scoped_refptr<PublicKey> public_key(new PublicKey());
+
+  // Keep already-existing public key.
+  if (public_key_.get() && public_key_->is_loaded()) {

[emaxx, 2017/02/22 17:24:33]

I believe you have to honor the force_key_load_ flag too.
(BTW, the async load path also contains a bug around this flag, and the fix is
in the stalled CL: http://crrev.com/2558543003. But let's not duplicate that bug
here too.)

And also the same comment on the code duplication as above: couldn't you reuse
the existing code on this synchronous load path?
E.g. LoadPublicKey() does almost the same as you need here, and it's doing it
already synchronously.

[Sergey Poromov, 2017/02/28 14:01:17]

Done.

+    public_key->data() = public_key_->data();
+  }
+  if (!public_key->is_loaded() && owner_key_util_->IsPublicKeyPresent()) {
+    if (!owner_key_util_->ImportPublicKey(&public_key->data()))
+      LOG(ERROR) << "Failed to load public owner key.";
+  }
+
+  public_key_ = public_key;
+
+  if (!public_key_.get() || !public_key_->is_loaded()) {
+    ReportResult(DeviceSettingsService::STORE_KEY_UNAVAILABLE);
+    return;
+  }
+
+  BlockingRetrieveDeviceSettings();
+}
+
 void SessionManagerOperation::ReportResult(
     DeviceSettingsService::Status status) {
   callback_.Run(this, status);
 }
 
 void SessionManagerOperation::EnsurePublicKey(const base::Closure& callback) {
   if (force_key_load_ || !public_key_.get() || !public_key_->is_loaded()) {
     scoped_refptr<base::TaskRunner> task_runner =
         content::BrowserThread::GetBlockingPool()
             ->GetTaskRunnerWithShutdownBehavior(
@@ skipping 42 matching lines @@
 
   callback.Run();
 }
 
 void SessionManagerOperation::RetrieveDeviceSettings() {
   session_manager_client()->RetrieveDevicePolicy(
       base::Bind(&SessionManagerOperation::ValidateDeviceSettings,
                  weak_factory_.GetWeakPtr()));
 }
 
+void SessionManagerOperation::BlockingRetrieveDeviceSettings() {
+  ValidateDeviceSettings(
+      session_manager_client()->BlockingRetrieveDevicePolicy());
+}
+
 void SessionManagerOperation::ValidateDeviceSettings(
     const std::string& policy_blob) {
   std::unique_ptr<em::PolicyFetchResponse> policy(
       new em::PolicyFetchResponse());
   if (policy_blob.empty()) {
     ReportResult(DeviceSettingsService::STORE_NO_POLICY);
     return;
   }
 
   if (!policy->ParseFromString(policy_blob) ||
@@ skipping 39 matching lines @@
         policy::CloudPolicyValidatorBase::DM_TOKEN_NOT_REQUIRED,
         policy::CloudPolicyValidatorBase::DEVICE_ID_NOT_REQUIRED);
 
     // We don't check the DMServer verification key below, because the signing
     // key is validated when it is installed.
     validator->ValidateSignature(public_key_->as_string());
   }
 
   validator->ValidatePolicyType(policy::dm_protocol::kChromeDevicePolicyType);
   validator->ValidatePayload();
-  validator->StartValidation(
-      base::Bind(&SessionManagerOperation::ReportValidatorStatus,
-                 weak_factory_.GetWeakPtr()));
+  if (force_immediate_load_) {
+    validator->RunValidation();
+    ReportValidatorStatus(validator);
+  } else {
+    validator->StartValidation(
+        base::Bind(&SessionManagerOperation::ReportValidatorStatus,
+                   weak_factory_.GetWeakPtr()));
+  }
 }
 
 void SessionManagerOperation::ReportValidatorStatus(
     policy::DeviceCloudPolicyValidator* validator) {
   DeviceSettingsService::Status status =
       DeviceSettingsService::STORE_VALIDATION_ERROR;
   if (validator->success()) {
     status = DeviceSettingsService::STORE_SUCCESS;
     policy_data_ = std::move(validator->policy_data());
     device_settings_ = std::move(validator->payload());
   } else {
     LOG(ERROR) << "Policy validation failed: " << validator->status();
 
     // Those are mostly caused by RTC loss and are recoverable.
     if (validator->status() ==
         policy::DeviceCloudPolicyValidator::VALIDATION_BAD_TIMESTAMP) {
       status = DeviceSettingsService::STORE_TEMP_VALIDATION_ERROR;
     }
   }
 
   ReportResult(status);
 }
 
 LoadSettingsOperation::LoadSettingsOperation(bool force_key_load,
                                              bool cloud_validations,
+                                             bool force_immediate_load,
                                              const Callback& callback)
     : SessionManagerOperation(callback) {
   force_key_load_ = force_key_load;
   cloud_validations_ = cloud_validations;
+  force_immediate_load_ = force_immediate_load;
 }
 
 LoadSettingsOperation::~LoadSettingsOperation() {}
 
 void LoadSettingsOperation::Run() {
-  StartLoading();
+  if (force_immediate_load_)
+    LoadImmediately();
+  else
+    StartLoading();
 }
 
 StoreSettingsOperation::StoreSettingsOperation(
     const Callback& callback,
     std::unique_ptr<em::PolicyFetchResponse> policy)
     : SessionManagerOperation(callback),
       policy_(std::move(policy)),
       weak_factory_(this) {}
 
 StoreSettingsOperation::~StoreSettingsOperation() {}
 
 void StoreSettingsOperation::Run() {
   session_manager_client()->StoreDevicePolicy(
       policy_->SerializeAsString(),
       base::Bind(&StoreSettingsOperation::HandleStoreResult,
                  weak_factory_.GetWeakPtr()));
 }
 
 void StoreSettingsOperation::HandleStoreResult(bool success) {
   if (!success)
     ReportResult(DeviceSettingsService::STORE_OPERATION_FAILED);
   else
     StartLoading();
 }
 
 }  // namespace chromeos