SessionTerminationManager query GetLoginStatus instead of GetTpmStatus

We are deprecating GetTpmStatus APIs by cryptohome.
Also, GetLoginStatus is a better fit to reporting "lock to single user"
status.

BUG=b:172748724
TEST=unit_tests.

Cq-Depend: chromium:2586412
Change-Id: I096e09c8ecbc670b03f375f059f70d466f8839e8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2586414
Commit-Queue: Leo Lai <cylai@google.com>
Reviewed-by: Maksim Ivanov <emaxx@chromium.org>
Cr-Commit-Position: refs/heads/master@{#836529}

chromeos/dbus/cryptohome/cryptohome_client.cc

@@ -404,6 +404,19 @@ class CryptohomeClientImpl : public CryptohomeClient {
     return CallBoolMethodAndBlock(&method_call, is_first_install);
   }
 
+  void GetLoginStatus(
+      const cryptohome::GetLoginStatusRequest& request,
+      DBusMethodCallback<cryptohome::BaseReply> callback) override {
+    dbus::MethodCall method_call(cryptohome::kCryptohomeInterface,
+                                 cryptohome::kCryptohomeGetLoginStatus);
+    dbus::MessageWriter writer(&method_call);
+    writer.AppendProtoAsArrayOfBytes(request);
+    proxy_->CallMethod(
+        &method_call, kTpmDBusTimeoutMs,
+        base::BindOnce(&CryptohomeClientImpl::OnBaseReplyMethod,
+                       weak_ptr_factory_.GetWeakPtr(), std::move(callback)));
+  }
+
   void GetKeyDataEx(
       const cryptohome::AccountIdentifier& id,
       const cryptohome::AuthorizationRequest& auth,

chromeos/dbus/cryptohome/cryptohome_client.h

@@ -29,6 +29,7 @@ class EndFingerprintAuthSessionRequest;
 class FlushAndSignBootAttributesRequest;
 class GetBootAttributeRequest;
 class GetKeyDataRequest;
+class GetLoginStatusRequest;
 class GetSupportedKeyPoliciesRequest;
 class GetTpmStatusRequest;
 class LockToSingleUserMountUntilRebootRequest;
@@ -275,6 +276,14 @@ class COMPONENT_EXPORT(CRYPTOHOME_CLIENT) CryptohomeClient {
   // succeeds. This method blocks until the call returns.
   virtual bool InstallAttributesIsFirstInstall(bool* is_first_install) = 0;
 
+  // Asynchronously calls the GetLoginStatus method. |callback| will be invoked
+  // with the reply protobuf.
+  // GetLoginStatus returns information about the current status of user login.
+  // For example, it tells if cryptohome is locked to single user until reboot.
+  virtual void GetLoginStatus(
+      const cryptohome::GetLoginStatusRequest& request,
+      DBusMethodCallback<cryptohome::BaseReply> callback) = 0;
+
   // Asynchronously calls the GetKeyDataEx method. |callback| will be invoked
   // with the reply protobuf.
   // GetKeyDataEx returns information about the key specified in |request|. At

chromeos/dbus/cryptohome/fake_cryptohome_client.cc

@@ -289,6 +289,18 @@ bool FakeCryptohomeClient::InstallAttributesIsFirstInstall(
   return true;
 }
 
+void FakeCryptohomeClient::GetLoginStatus(
+    const cryptohome::GetLoginStatusRequest& request,
+    DBusMethodCallback<cryptohome::BaseReply> callback) {
+  cryptohome::BaseReply reply;
+  cryptohome::GetLoginStatusReply* get_login_status_reply =
+      reply.MutableExtension(cryptohome::GetLoginStatusReply::reply);
+  get_login_status_reply->set_owner_user_exists(false);
+  get_login_status_reply->set_boot_lockbox_finalized(false);
+  get_login_status_reply->set_is_locked_to_single_user(false);
+  ReturnProtobufMethodCallback(reply, std::move(callback));
+}
+
 void FakeCryptohomeClient::GetKeyDataEx(
     const cryptohome::AccountIdentifier& cryptohome_id,
     const cryptohome::AuthorizationRequest& auth,

chromeos/dbus/cryptohome/fake_cryptohome_client.h

@@ -91,6 +91,9 @@ class COMPONENT_EXPORT(CRYPTOHOME_CLIENT) FakeCryptohomeClient
   void InstallAttributesIsReady(DBusMethodCallback<bool> callback) override;
   bool InstallAttributesIsInvalid(bool* is_invalid) override;
   bool InstallAttributesIsFirstInstall(bool* is_first_install) override;
+  void GetLoginStatus(
+      const cryptohome::GetLoginStatusRequest& request,
+      DBusMethodCallback<cryptohome::BaseReply> callback) override;
   void GetKeyDataEx(
       const cryptohome::AccountIdentifier& cryptohome_id,
       const cryptohome::AuthorizationRequest& auth,

chromeos/login/session/session_termination_manager.cc

@@ -63,22 +63,23 @@ void SessionTerminationManager::DidWaitForServiceToBeAvailable(
     LOG(ERROR) << "WaitForServiceToBeAvailable failed.";
     return;
   }
-  CryptohomeClient::Get()->GetTpmStatus(
-      cryptohome::GetTpmStatusRequest(),
+  CryptohomeClient::Get()->GetLoginStatus(
+      cryptohome::GetLoginStatusRequest(),
       base::BindOnce(&SessionTerminationManager::RebootIfNecessaryProcessReply,
                      weak_factory_.GetWeakPtr()));
 }
 
-void SessionTerminationManager::ProcessTpmStatusReply(
+void SessionTerminationManager::ProcessCryptohomeLoginStatusReply(
     const base::Optional<cryptohome::BaseReply>& reply) {
   if (!reply.has_value() || reply->has_error() ||
-      !reply->HasExtension(cryptohome::GetTpmStatusReply::reply)) {
-    LOG(ERROR) << "TPM status request failed, error: "
+      !reply->HasExtension(cryptohome::GetLoginStatusReply::reply)) {
+    LOG(ERROR) << "Login status request failed, error: "
                << (reply.has_value() && reply->has_error() ? reply->error()
                                                            : 0);
     return;
   }
-  auto reply_proto = reply->GetExtension(cryptohome::GetTpmStatusReply::reply);
+  auto reply_proto =
+      reply->GetExtension(cryptohome::GetLoginStatusReply::reply);
   if (reply_proto.has_is_locked_to_single_user() &&
       reply_proto.is_locked_to_single_user()) {
     is_locked_to_single_user_ = true;
@@ -92,7 +93,7 @@ void SessionTerminationManager::Reboot() {
 
 void SessionTerminationManager::RebootIfNecessaryProcessReply(
     base::Optional<cryptohome::BaseReply> reply) {
-  ProcessTpmStatusReply(reply);
+  ProcessCryptohomeLoginStatusReply(reply);
   if (is_locked_to_single_user_)
     Reboot();
 }

chromeos/login/session/session_termination_manager.h

@@ -36,7 +36,7 @@ class COMPONENT_EXPORT(CHROMEOS_LOGIN_SESSION) SessionTerminationManager {
 
  private:
   void DidWaitForServiceToBeAvailable(bool service_is_available);
-  void ProcessTpmStatusReply(
+  void ProcessCryptohomeLoginStatusReply(
       const base::Optional<cryptohome::BaseReply>& reply);
   void Reboot();
   void RebootIfNecessaryProcessReply(