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

chrome/browser/chromeos/policy/device_local_account_policy_store.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_POLICY_DEVICE_LOCAL_ACCOUNT_POLICY_STORE_H_
 #define CHROME_BROWSER_CHROMEOS_POLICY_DEVICE_LOCAL_ACCOUNT_POLICY_STORE_H_
 
 #include <memory>
 #include <string>
 
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/chromeos/settings/device_settings_service.h"
-#include "chromeos/dbus/session_manager_client.h"
 #include "components/policy/core/common/cloud/cloud_policy_validator.h"
 #include "components/policy/core/common/cloud/user_cloud_policy_store_base.h"
 
 namespace base {
 class SequencedTaskRunner;
 }
 
+namespace chromeos {
+class SessionManagerClient;
+}
+
 namespace enterprise_management {
 class PolicyFetchResponse;
 }
 
 namespace policy {
 
 // CloudPolicyStore implementation for device-local account policy. Stores/loads
 // policy to/from session_manager.
 class DeviceLocalAccountPolicyStore : public UserCloudPolicyStoreBase {
  public:
@@ skipping 14 matching lines @@
   void LoadImmediately();
 
  private:
   // The callback invoked once policy validation is complete. Passed are the
   // used public key and the validator.
   using ValidateCompletionCallback =
       base::Callback<void(const std::string&, UserCloudPolicyValidator*)>;
 
   // Called back by |session_manager_client_| after policy retrieval. Checks for
   // success and triggers policy validation.
-  void ValidateLoadedPolicyBlob(
-      bool validate_in_background,
-      const std::string& policy_blob,
-      chromeos::SessionManagerClient::RetrievePolicyResponseType response_type);
+  void ValidateLoadedPolicyBlob(bool validate_in_background,
+                                const std::string& policy_blob);
 
   // Updates state after validation and notifies observers.
   void UpdatePolicy(const std::string& signature_validation_public_key,
                     UserCloudPolicyValidator* validator);
 
   // Sends the policy blob to session_manager for storing after validation.
   void StoreValidatedPolicy(
       const std::string& signature_validation_public_key_unused,
       UserCloudPolicyValidator* validator);
 
@@ skipping 23 matching lines @@
   scoped_refptr<base::SequencedTaskRunner> background_task_runner_;
 
   base::WeakPtrFactory<DeviceLocalAccountPolicyStore> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(DeviceLocalAccountPolicyStore);
 };
 
 }  // namespace policy
 
 #endif  // CHROME_BROWSER_CHROMEOS_POLICY_DEVICE_LOCAL_ACCOUNT_POLICY_STORE_H_