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 3b67b31d107b70fba69c87f2c27e4d8af379c218..43a8ebe69eefae337a55c14aaca3f7fb01ac2934 100644
--- a/chrome/browser/chromeos/settings/session_manager_operation.h
+++ b/chrome/browser/chromeos/settings/session_manager_operation.h
@@ -12,8 +12,12 @@
 #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"
 
+using RetrievePolicyResponseType =

[emaxx, 2017/04/24 16:37:50]

nit: Global type aliases that are there only for typing saving shouldn't be
placed in headers:
https://google.github.io/styleguide/cppguide.html#Aliases

[igorcov, 2017/04/25 09:18:41]

Done.

+    chromeos::SessionManagerClient::RetrievePolicyResponseType;
+
 namespace enterprise_management {
 class ChromeDeviceSettingsProto;
 class PolicyData;
@@ -27,8 +31,6 @@ 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.
@@ -111,7 +113,8 @@ class SessionManagerOperation {
   void BlockingRetrieveDeviceSettings();
 
   // Validates device settings after retrieval from session_manager.
-  void ValidateDeviceSettings(const std::string& policy_blob);
+  void ValidateDeviceSettings(const std::string& policy_blob,
+                              RetrievePolicyResponseType response_type);
 
   // Extracts status and device settings from the validator and reports them.
   void ReportValidatorStatus(policy::DeviceCloudPolicyValidator* validator);