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

chrome/browser/chromeos/settings/session_manager_operation.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_SETTINGS_SESSION_MANAGER_OPERATION_H_
 #define CHROME_BROWSER_CHROMEOS_SETTINGS_SESSION_MANAGER_OPERATION_H_
 
 #include <memory>
 
 #include "base/callback.h"
 #include "base/macros.h"
 #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 {
 class ChromeDeviceSettingsProto;
 class PolicyData;
 class PolicyFetchResponse;
 }
 
 namespace ownership {
 class OwnerKeyUtil;
 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.
 class SessionManagerOperation {
  public:
   typedef base::Callback<void(SessionManagerOperation*,
                               DeviceSettingsService::Status)> Callback;
 
   // Creates a new load operation.
   explicit SessionManagerOperation(const Callback& callback);
@@ skipping 62 matching lines @@
   void StorePublicKey(const base::Closure& callback,
                       scoped_refptr<ownership::PublicKey> new_key);
 
   // Triggers a device settings load.
   void RetrieveDeviceSettings();
 
   // Same as RetrieveDeviceSettings, but loads synchronously.
   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);
 
   SessionManagerClient* session_manager_client_ = nullptr;
   scoped_refptr<ownership::OwnerKeyUtil> owner_key_util_;
 
   Callback callback_;
 
   scoped_refptr<ownership::PublicKey> public_key_;
@@ skipping 51 matching lines @@
   std::unique_ptr<enterprise_management::PolicyFetchResponse> policy_;
 
   base::WeakPtrFactory<StoreSettingsOperation> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(StoreSettingsOperation);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_SETTINGS_SESSION_MANAGER_OPERATION_H_