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

chromeos/dbus/blocking_method_caller_unittest.cc

 // 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.
 
 #include "chromeos/dbus/blocking_method_caller.h"
 
 #include <memory>
 
 #include "base/callback.h"
 #include "base/logging.h"
@@ skipping 42 matching lines @@
     mock_bus_ = new dbus::MockBus(options);
 
     // Create a mock proxy.
     mock_proxy_ = new dbus::MockObjectProxy(
         mock_bus_.get(),
         "org.chromium.TestService",
         dbus::ObjectPath("/org/chromium/TestObject"));
 
     // Set an expectation so mock_proxy's CallMethodAndBlock() will use
     // CreateMockProxyResponse() to return responses.
-    EXPECT_CALL(*mock_proxy_.get(),
-                MockCallMethodAndBlockWithErrorDetails(_, _, _))
+    EXPECT_CALL(*mock_proxy_.get(), MockCallMethodAndBlock(_, _))
         .WillRepeatedly(
-            Invoke(this, &BlockingMethodCallerTest::CreateMockProxyResponse));
+             Invoke(this, &BlockingMethodCallerTest::CreateMockProxyResponse));
 
     // Set an expectation so mock_bus's GetObjectProxy() for the given
     // service name and the object path will return mock_proxy_.
     EXPECT_CALL(*mock_bus_.get(),
                 GetObjectProxy("org.chromium.TestService",
                                dbus::ObjectPath("/org/chromium/TestObject")))
         .WillOnce(Return(mock_proxy_.get()));
 
     // Set an expectation so mock_bus's GetDBusTaskRunner will return the fake
     // task runner.
     EXPECT_CALL(*mock_bus_.get(), GetDBusTaskRunner())
         .WillRepeatedly(Return(task_runner_.get()));
 
     // ShutdownAndBlock() will be called in TearDown().
     EXPECT_CALL(*mock_bus_.get(), ShutdownAndBlock()).WillOnce(Return());
   }
 
   void TearDown() override { mock_bus_->ShutdownAndBlock(); }
 
  protected:
   scoped_refptr<FakeTaskRunner> task_runner_;
   scoped_refptr<dbus::MockBus> mock_bus_;
   scoped_refptr<dbus::MockObjectProxy> mock_proxy_;
 
  private:
   // Returns a response for the given method call. Used to implement
   // CallMethodAndBlock() for |mock_proxy_|.
   dbus::Response* CreateMockProxyResponse(dbus::MethodCall* method_call,
-                                          int timeout_ms,
-                                          dbus::ScopedDBusError* error) {
+                                          int timeout_ms) {
     if (method_call->GetInterface() == "org.chromium.TestInterface" &&
         method_call->GetMember() == "Echo") {
       dbus::MessageReader reader(method_call);
       std::string text_message;
       if (reader.PopString(&text_message)) {
         std::unique_ptr<dbus::Response> response =
             dbus::Response::CreateEmpty();
         dbus::MessageWriter writer(response.get());
         writer.AppendString(text_message);
         return response.release();
@@ skipping 25 matching lines @@
   // Check the response.
   ASSERT_TRUE(response.get());
   dbus::MessageReader reader(response.get());
   std::string text_message;
   ASSERT_TRUE(reader.PopString(&text_message));
   // The text message should be echo'ed back.
   EXPECT_EQ(kHello, text_message);
 }
 
 }  // namespace chromeos