Revert "Abandon user sign in when policy is retrieved before session started."

chromeos/dbus/fake_session_manager_client.cc

 // Copyright 2013 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 "chromeos/dbus/fake_session_manager_client.h"
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/location.h"
 #include "base/numerics/safe_conversions.h"
 #include "base/path_service.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/string_util.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "chromeos/chromeos_paths.h"
 #include "chromeos/dbus/cryptohome_client.h"
 #include "components/policy/proto/device_management_backend.pb.h"
 
-using RetrievePolicyResponseType =
-    chromeos::FakeSessionManagerClient::RetrievePolicyResponseType;
-
 namespace chromeos {
 
 namespace {
 
 // Store the owner key in a file on the disk, so that it can be loaded by
 // DeviceSettingsService and used e.g. for validating policy signatures in the
 // integration tests. This is done on behalf of the real session manager, that
 // would be managing the owner key file on Chrome OS.
 bool StoreOwnerKey(const std::string& public_key) {
   base::FilePath owner_key_path;
@@ skipping 91 matching lines @@
 
 void FakeSessionManagerClient::RetrieveActiveSessions(
       const ActiveSessionsCallback& callback) {
   base::ThreadTaskRunnerHandle::Get()->PostTask(
       FROM_HERE, base::Bind(callback, user_sessions_, true));
 }
 
 void FakeSessionManagerClient::RetrieveDevicePolicy(
     const RetrievePolicyCallback& callback) {
   base::ThreadTaskRunnerHandle::Get()->PostTask(
-      FROM_HERE, base::Bind(callback, device_policy_,
-                            RetrievePolicyResponseType::SUCCESS));
+      FROM_HERE, base::Bind(callback, device_policy_));
 }
 
-RetrievePolicyResponseType
-FakeSessionManagerClient::BlockingRetrieveDevicePolicy(
-    std::string* policy_out) {
-  *policy_out = device_policy_;
-  return RetrievePolicyResponseType::SUCCESS;
+std::string FakeSessionManagerClient::BlockingRetrieveDevicePolicy() {
+  return device_policy_;
 }
 
 void FakeSessionManagerClient::RetrievePolicyForUser(
     const cryptohome::Identification& cryptohome_id,
     const RetrievePolicyCallback& callback) {
   base::ThreadTaskRunnerHandle::Get()->PostTask(
-      FROM_HERE, base::Bind(callback, user_policies_[cryptohome_id],
-                            RetrievePolicyResponseType::SUCCESS));
+      FROM_HERE, base::Bind(callback, user_policies_[cryptohome_id]));
 }
 
-RetrievePolicyResponseType
-FakeSessionManagerClient::BlockingRetrievePolicyForUser(
-    const cryptohome::Identification& cryptohome_id,
-    std::string* policy_out) {
-  *policy_out = user_policies_[cryptohome_id];
-  return RetrievePolicyResponseType::SUCCESS;
+std::string FakeSessionManagerClient::BlockingRetrievePolicyForUser(
+    const cryptohome::Identification& cryptohome_id) {
+  return user_policies_[cryptohome_id];
 }
 
 void FakeSessionManagerClient::RetrieveDeviceLocalAccountPolicy(
     const std::string& account_id,
     const RetrievePolicyCallback& callback) {
   base::ThreadTaskRunnerHandle::Get()->PostTask(
-      FROM_HERE, base::Bind(callback, device_local_account_policy_[account_id],
-                            RetrievePolicyResponseType::SUCCESS));
+      FROM_HERE,
+      base::Bind(callback, device_local_account_policy_[account_id]));
 }
 
-RetrievePolicyResponseType
-FakeSessionManagerClient::BlockingRetrieveDeviceLocalAccountPolicy(
-    const std::string& account_id,
-    std::string* policy_out) {
-  *policy_out = device_local_account_policy_[account_id];
-  return RetrievePolicyResponseType::SUCCESS;
+std::string FakeSessionManagerClient::BlockingRetrieveDeviceLocalAccountPolicy(
+    const std::string& account_id) {
+  return device_local_account_policy_[account_id];
 }
 
 void FakeSessionManagerClient::StoreDevicePolicy(
     const std::string& policy_blob,
     const StorePolicyCallback& callback) {
   enterprise_management::PolicyFetchResponse policy;
   if (!policy.ParseFromString(policy_blob)) {
     LOG(ERROR) << "Unable to parse policy protobuf";
     base::ThreadTaskRunnerHandle::Get()->PostTask(
         FROM_HERE, base::Bind(callback, false /* success */));
@@ skipping 133 matching lines @@
     const std::string& policy_blob) {
   device_local_account_policy_[account_id] = policy_blob;
 }
 
 void FakeSessionManagerClient::OnPropertyChangeComplete(bool success) {
   for (auto& observer : observers_)
     observer.PropertyChangeComplete(success);
 }
 
 }  // namespace chromeos