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

chrome/browser/chromeos/settings/session_manager_operation_unittest.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 <stdint.h>
 
 #include <memory>
 #include <string>
@@ skipping 90 matching lines @@
 
   bool validated_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(SessionManagerOperationTest);
 };
 
 TEST_F(SessionManagerOperationTest, LoadNoPolicyNoKey) {
   LoadSettingsOperation op(
       false /* force_key_load */, true /* cloud_validations */,
+      false /* force_immediate_load */,
       base::Bind(&SessionManagerOperationTest::OnOperationCompleted,
                  base::Unretained(this)));
 
   EXPECT_CALL(*this,
               OnOperationCompleted(
                   &op, DeviceSettingsService::STORE_KEY_UNAVAILABLE));
   op.Start(&device_settings_test_helper_, owner_key_util_, NULL);
   device_settings_test_helper_.Flush();
   Mock::VerifyAndClearExpectations(this);
 
   EXPECT_FALSE(op.policy_data().get());
   EXPECT_FALSE(op.device_settings().get());
   ASSERT_TRUE(op.public_key().get());
   EXPECT_FALSE(op.public_key()->is_loaded());
 }
 
 TEST_F(SessionManagerOperationTest, LoadOwnerKey) {
   owner_key_util_->SetPublicKeyFromPrivateKey(*policy_.GetSigningKey());
   LoadSettingsOperation op(
       false /* force_key_load */, true /* cloud_validations */,
+      false /* force_immediate_load */,
       base::Bind(&SessionManagerOperationTest::OnOperationCompleted,
                  base::Unretained(this)));
 
   EXPECT_CALL(*this,
               OnOperationCompleted(
                   &op, DeviceSettingsService::STORE_NO_POLICY));
   op.Start(&device_settings_test_helper_, owner_key_util_, NULL);
   device_settings_test_helper_.Flush();
   Mock::VerifyAndClearExpectations(this);
 
   CheckPublicKeyLoaded(&op);
 }
 
 TEST_F(SessionManagerOperationTest, LoadPolicy) {
   owner_key_util_->SetPublicKeyFromPrivateKey(*policy_.GetSigningKey());
   device_settings_test_helper_.set_policy_blob(policy_.GetBlob());
   LoadSettingsOperation op(
       false /* force_key_load */, true /* cloud_validations */,
+      false /* force_immediate_load */,
       base::Bind(&SessionManagerOperationTest::OnOperationCompleted,
                  base::Unretained(this)));
 
+  EXPECT_CALL(*this,
+              OnOperationCompleted(&op, DeviceSettingsService::STORE_SUCCESS));
+  op.Start(&device_settings_test_helper_, owner_key_util_, NULL);
+  device_settings_test_helper_.Flush();
+  Mock::VerifyAndClearExpectations(this);
+
+  ASSERT_TRUE(op.policy_data().get());
+  EXPECT_EQ(policy_.policy_data().SerializeAsString(),
+            op.policy_data()->SerializeAsString());
+  ASSERT_TRUE(op.device_settings().get());
+  EXPECT_EQ(policy_.payload().SerializeAsString(),
+            op.device_settings()->SerializeAsString());
+}
+
+TEST_F(SessionManagerOperationTest, LoadImmediately) {
+  owner_key_util_->SetPublicKeyFromPrivateKey(*policy_.GetSigningKey());
+  device_settings_test_helper_.set_policy_blob(policy_.GetBlob());
+  LoadSettingsOperation op(
+      false /* force_key_load */, true /* cloud_validations */,
+      true /* force_immediate_load */,
+      base::Bind(&SessionManagerOperationTest::OnOperationCompleted,
+                 base::Unretained(this)));
+
   EXPECT_CALL(*this,
               OnOperationCompleted(
                   &op, DeviceSettingsService::STORE_SUCCESS));
   op.Start(&device_settings_test_helper_, owner_key_util_, NULL);
   device_settings_test_helper_.Flush();
   Mock::VerifyAndClearExpectations(this);
 
   ASSERT_TRUE(op.policy_data().get());
   EXPECT_EQ(policy_.policy_data().SerializeAsString(),
             op.policy_data()->SerializeAsString());
   ASSERT_TRUE(op.device_settings().get());
   EXPECT_EQ(policy_.payload().SerializeAsString(),
             op.device_settings()->SerializeAsString());
 }
 
 TEST_F(SessionManagerOperationTest, RestartLoad) {
   owner_key_util_->SetPrivateKey(policy_.GetSigningKey());
   device_settings_test_helper_.set_policy_blob(policy_.GetBlob());
   LoadSettingsOperation op(
       false /* force_key_load */, true /* cloud_validations */,
+      false /* force_immediate_load */,
       base::Bind(&SessionManagerOperationTest::OnOperationCompleted,
                  base::Unretained(this)));
 
   EXPECT_CALL(*this, OnOperationCompleted(&op, _)).Times(0);
   op.Start(&device_settings_test_helper_, owner_key_util_, NULL);
   content::RunAllBlockingPoolTasksUntilIdle();
   device_settings_test_helper_.FlushRetrieve();
   EXPECT_TRUE(op.public_key().get());
   EXPECT_TRUE(op.public_key()->is_loaded());
   Mock::VerifyAndClearExpectations(this);
@@ skipping 42 matching lines @@
             policy_.GetBlob());
   ASSERT_TRUE(op.policy_data().get());
   EXPECT_EQ(policy_.policy_data().SerializeAsString(),
             op.policy_data()->SerializeAsString());
   ASSERT_TRUE(op.device_settings().get());
   EXPECT_EQ(policy_.payload().SerializeAsString(),
             op.device_settings()->SerializeAsString());
 }
 
 }  // namespace chromeos