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 52874b3530e3c4feff543d5ac897d8c0ee41b644..a831d339ec5a97c1ec73a8b7586491ff13c9f163 100644
--- a/ash/login/mock_lock_screen_client.h
+++ b/ash/login/mock_lock_screen_client.h
@@ -18,13 +18,25 @@ class MockLockScreenClient : public mojom::LockScreenClient {
 
   mojom::LockScreenClientPtr CreateInterfacePtrAndBind();
 
+  // Result that should be passed to |callback| in |AuthenticateUser|.
+  void set_authenticate_user_callback_result(bool value) {
+    authenticate_user_callback_result_ = value;
+  }

[xiyuan, 2017/06/07 19:02:28]

nit: move this the last of all methods. Prevailing style is to put accessors at
the end.

[jdufault, 2017/06/07 22:53:21]

I've done some reordering. Does the accessor go after overrides? I recall
usually seeing overrides last.

[xiyuan, 2017/06/07 23:03:21]

I personally prefer to put accessors to the very last. But style guide does not
specify this. So I guess it is up to each person's taste. 

[jdufault, 2017/06/08 17:36:06]

I'd prefer to leave as is - I can reorder if you feel strongly though.

[xiyuan, 2017/06/08 17:49:06]

Acknowledged.

+
   // mojom::LockScreenClient:
-  MOCK_METHOD3(AuthenticateUser,
+  void AuthenticateUser(const AccountId& account_id,
+                        const std::string& password,
+                        bool authenticated_by_pin,
+                        AuthenticateUserCallback callback) override;
+  MOCK_METHOD4(AuthenticateUser_,
                void(const AccountId& account_id,
                     const std::string& password,
-                    bool authenticated_by_pin));
+                    bool authenticated_by_pin,
+                    AuthenticateUserCallback& callback));
 
  private:
+  bool authenticate_user_callback_result_ = true;
+
   mojo::Binding<ash::mojom::LockScreenClient> binding_;
 
   DISALLOW_COPY_AND_ASSIGN(MockLockScreenClient);