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

chrome/browser/chromeos/settings/session_manager_operation.h

Index: chrome/browser/chromeos/settings/session_manager_operation.h
diff --git a/chrome/browser/chromeos/settings/session_manager_operation.h b/chrome/browser/chromeos/settings/session_manager_operation.h
index b57a3d855125c262f0418679bda5e8b71ac760a0..3b67b31d107b70fba69c87f2c27e4d8af379c218 100644
--- a/chrome/browser/chromeos/settings/session_manager_operation.h
+++ b/chrome/browser/chromeos/settings/session_manager_operation.h
@@ -12,7 +12,6 @@
 #include "base/memory/ref_counted.h"
 #include "chrome/browser/chromeos/policy/device_cloud_policy_validator.h"
 #include "chrome/browser/chromeos/settings/device_settings_service.h"
-#include "chromeos/dbus/session_manager_client.h"
 #include "net/cert/x509_util_nss.h"
 
 namespace enterprise_management {
@@ -28,6 +27,8 @@ class PublicKey;
 
 namespace chromeos {
 
+class SessionManagerClient;
+
 // Handles a single transaction with session manager. This is a virtual base
 // class that contains common infrastructure for key and policy loading. There
 // are subclasses for loading, storing and signing policy blobs.
@@ -110,9 +111,7 @@ class SessionManagerOperation {
   void BlockingRetrieveDeviceSettings();
 
   // Validates device settings after retrieval from session_manager.
-  void ValidateDeviceSettings(
-      const std::string& policy_blob,
-      SessionManagerClient::RetrievePolicyResponseType response_type);
+  void ValidateDeviceSettings(const std::string& policy_blob);
 
   // Extracts status and device settings from the validator and reports them.
   void ReportValidatorStatus(policy::DeviceCloudPolicyValidator* validator);