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

chromeos/dbus/mock_session_manager_client.h

Index: chromeos/dbus/mock_session_manager_client.h
diff --git a/chromeos/dbus/mock_session_manager_client.h b/chromeos/dbus/mock_session_manager_client.h
index 74d5a67a5f6307b9b8119ed62a698cc916356255..82b568ee00ff5d0fe02855a2dd775fcb9dd42e9a 100644
--- a/chromeos/dbus/mock_session_manager_client.h
+++ b/chromeos/dbus/mock_session_manager_client.h
@@ -40,19 +40,17 @@ class MockSessionManagerClient : public SessionManagerClient {
   MOCK_METHOD0(NotifyLockScreenDismissed, void(void));
   MOCK_METHOD1(RetrieveActiveSessions, void(const ActiveSessionsCallback&));
   MOCK_METHOD1(RetrieveDevicePolicy, void(const RetrievePolicyCallback&));
-  MOCK_METHOD1(BlockingRetrieveDevicePolicy,
-               RetrievePolicyResponseType(std::string*));
+  MOCK_METHOD0(BlockingRetrieveDevicePolicy, std::string(void));
   MOCK_METHOD2(RetrievePolicyForUser,
                void(const cryptohome::Identification&,
                     const RetrievePolicyCallback&));
-  MOCK_METHOD2(BlockingRetrievePolicyForUser,
-               RetrievePolicyResponseType(const cryptohome::Identification&,
-                                          std::string*));
+  MOCK_METHOD1(BlockingRetrievePolicyForUser,
+               std::string(const cryptohome::Identification&));
   MOCK_METHOD2(RetrieveDeviceLocalAccountPolicy,
                void(const std::string&,
                     const RetrievePolicyCallback&));
-  MOCK_METHOD2(BlockingRetrieveDeviceLocalAccountPolicy,
-               RetrievePolicyResponseType(const std::string&, std::string*));
+  MOCK_METHOD1(BlockingRetrieveDeviceLocalAccountPolicy,
+               std::string(const std::string&));
   MOCK_METHOD2(StoreDevicePolicy,
                void(const std::string&,
                     const StorePolicyCallback&));