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

chrome/browser/chromeos/settings/device_settings_test_helper.h

Index: chrome/browser/chromeos/settings/device_settings_test_helper.h
diff --git a/chrome/browser/chromeos/settings/device_settings_test_helper.h b/chrome/browser/chromeos/settings/device_settings_test_helper.h
index 98de5140146b2310ffa36207c8bc295a9937a83e..ce64e1a6182fb1b5fa2adb3496338e01382eac8a 100644
--- a/chrome/browser/chromeos/settings/device_settings_test_helper.h
+++ b/chrome/browser/chromeos/settings/device_settings_test_helper.h
@@ -82,14 +82,12 @@ class DeviceSettingsTestHelper : public MockSessionManagerClient {
 
   // SessionManagerClient:
   void RetrieveDevicePolicy(const RetrievePolicyCallback& callback) override;
-  RetrievePolicyResponseType BlockingRetrieveDevicePolicy(
-      std::string* policy_out) override;
+  std::string BlockingRetrieveDevicePolicy() override;
   void RetrieveDeviceLocalAccountPolicy(
       const std::string& account_id,
       const RetrievePolicyCallback& callback) override;
-  RetrievePolicyResponseType BlockingRetrieveDeviceLocalAccountPolicy(
-      const std::string& account_id,
-      std::string* policy_out) override;
+  std::string BlockingRetrieveDeviceLocalAccountPolicy(
+      const std::string& account_id) override;
   void StoreDevicePolicy(const std::string& policy_blob,
                          const StorePolicyCallback& callback) override;
   void StoreDeviceLocalAccountPolicy(