Abandon user sign in when policy is retrieved before session started

chrome/browser/chromeos/policy/user_cloud_policy_store_chromeos.h

Index: chrome/browser/chromeos/policy/user_cloud_policy_store_chromeos.h
diff --git a/chrome/browser/chromeos/policy/user_cloud_policy_store_chromeos.h b/chrome/browser/chromeos/policy/user_cloud_policy_store_chromeos.h
index 4c4021890eae7af03bba8576cec527451d3511eb..cbf7e8a04b1e94db7873973e663d5191a381ac38 100644
--- a/chrome/browser/chromeos/policy/user_cloud_policy_store_chromeos.h
+++ b/chrome/browser/chromeos/policy/user_cloud_policy_store_chromeos.h
@@ -15,17 +15,20 @@
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "chromeos/dbus/dbus_method_call_status.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"
 #include "components/signin/core/account_id/account_id.h"
 
+using RetrievePolicyResponseType =

[Daniel Erat, 2017/04/24 19:50:13]

this one needs to go back to the way it was before; don't put 'using' in header
files (since it pollutes the namespace of every file that includes the header)

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

Done.

+    chromeos::SessionManagerClient::RetrievePolicyResponseType;
+
 namespace base {
 class SequencedTaskRunner;
 }
 
 namespace chromeos {
 class CryptohomeClient;
-class SessionManagerClient;
 }
 
 namespace policy {
@@ -71,7 +74,8 @@ class UserCloudPolicyStoreChromeOS : public UserCloudPolicyStoreBase {
   void OnPolicyStored(bool success);
 
   // Called back from SessionManagerClient for policy load operations.
-  void OnPolicyRetrieved(const std::string& policy_blob);
+  void OnPolicyRetrieved(const std::string& policy_blob,
+                         RetrievePolicyResponseType response);
 
   // Starts validation of the loaded |policy| before installing it.
   void ValidateRetrievedPolicy(