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

chromeos/dbus/mock_session_manager_client.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 CHROMEOS_DBUS_MOCK_SESSION_MANAGER_CLIENT_H_
 #define CHROMEOS_DBUS_MOCK_SESSION_MANAGER_CLIENT_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 22 matching lines @@
   MOCK_METHOD1(StartSession, void(const cryptohome::Identification&));
   MOCK_METHOD0(StopSession, void(void));
   MOCK_METHOD0(NotifySupervisedUserCreationStarted, void(void));
   MOCK_METHOD0(NotifySupervisedUserCreationFinished, void(void));
   MOCK_METHOD0(StartDeviceWipe, void(void));
   MOCK_METHOD0(RequestLockScreen, void(void));
   MOCK_METHOD0(NotifyLockScreenShown, void(void));
   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&));
   MOCK_METHOD3(StorePolicyForUser,
                void(const cryptohome::Identification&,
                     const std::string&,
                     const StorePolicyCallback&));
   MOCK_METHOD3(StoreDeviceLocalAccountPolicy,
                void(const std::string&,
                     const std::string&,
@@ skipping 15 matching lines @@
   MOCK_METHOD2(EmitArcBooted,
                void(const cryptohome::Identification&, const ArcCallback&));
   MOCK_METHOD1(GetArcStartTime, void(const GetArcStartTimeCallback&));
   MOCK_METHOD2(RemoveArcData,
                void(const cryptohome::Identification&, const ArcCallback&));
 };
 
 }  // namespace chromeos
 
 #endif  // CHROMEOS_DBUS_MOCK_SESSION_MANAGER_CLIENT_H_