cros: Make sure views-based lock screen is destroyed after it is dismissed.

ash/login/mock_lock_screen_client.h

Index: ash/login/mock_lock_screen_client.h
diff --git a/ash/login/mock_lock_screen_client.h b/ash/login/mock_lock_screen_client.h
index 3900dafaa3542b0ca7490ef0cf396488b0158ff4..60bbac1c958d7b13189707f67b0547ae0a484314 100644
--- a/ash/login/mock_lock_screen_client.h
+++ b/ash/login/mock_lock_screen_client.h
@@ -18,16 +18,29 @@ class MockLockScreenClient : public mojom::LockScreenClient {
 
   mojom::LockScreenClientPtr CreateInterfacePtrAndBind();
 
-  // mojom::LockScreenClient:
-  MOCK_METHOD3(AuthenticateUser,
+  MOCK_METHOD4(AuthenticateUser_,

[James Cook, 2017/06/08 19:47:12]

Is this "MethodName_" thing a gmock convention? I have never seen it before.

I am not an ash/login OWNER but it feels to me like either the object should use
MOCK_METHOD for the entire LockScreenClient interface, or it shouldn't use gmock
at all.

[jdufault, 2017/06/08 22:23:14]

It's a bit of a mess, but gmock doesn't support move-only types (ie,
AuthenticateUserCallback). See [1] for some context.

When writing tests you have to use AuthenticateUser_ instead of
AuthenticateUser. So the net result is that you still have gmock for the entire
interface.

It's a bit ugly, but since this interface has a decently large surface area
(there are more methods coming) in my eyes gmock is still a net win.

1: https://github.com/google/googletest/issues/395#issuecomment-125645943

                void(const AccountId& account_id,
                     const std::string& password,
-                    bool authenticated_by_pin));
+                    bool authenticated_by_pin,
+                    AuthenticateUserCallback& callback));
+
+  // Set the result that should be passed to |callback| in |AuthenticateUser|.
+  void set_authenticate_user_callback_result(bool value) {
+    authenticate_user_callback_result_ = value;
+  }
+
+  // mojom::LockScreenClient:
+  void AuthenticateUser(const AccountId& account_id,
+                        const std::string& password,
+                        bool authenticated_by_pin,
+                        AuthenticateUserCallback callback) override;
   MOCK_METHOD1(AttemptUnlock, void(const AccountId& account_id));
   MOCK_METHOD1(HardlockPod, void(const AccountId& account_id));
   MOCK_METHOD1(RecordClickOnLockIcon, void(const AccountId& account_id));
 
  private:
+  bool authenticate_user_callback_result_ = true;
+
   mojo::Binding<ash::mojom::LockScreenClient> binding_;
 
   DISALLOW_COPY_AND_ASSIGN(MockLockScreenClient);
@@ -38,4 +51,4 @@ std::unique_ptr<MockLockScreenClient> BindMockLockScreenClient();
 
 }  // namespace ash
 
-#endif  // ASH_LOGIN_MOCK_LOCK_SCREEN_CLIENT_H_
+#endif  // ASH_LOGIN_MOCK_LOCK_SCREEN_CLIENT_H_