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

ash/login/lock_screen_controller_unittest.cc

 // Copyright 2017 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 "ash/login/lock_screen_controller.h"
 
 #include "ash/login/mock_lock_screen_client.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "base/run_loop.h"
 
 using ::testing::_;
 
 namespace ash {
 
 namespace {
 using LockScreenControllerTest = test::AshTestBase;
 }  // namespace

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

nit: This whole file should go in the anonymous namespace

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

Done, there doesn't seem to be a strong consensus here though.

 
 TEST_F(LockScreenControllerTest, RequestAuthentication) {
   LockScreenController* controller = Shell::Get()->lock_screen_controller();
   std::unique_ptr<MockLockScreenClient> client = BindMockLockScreenClient();
 
   AccountId id = AccountId::FromUserEmail("user1@test.com");
 
   // We hardcode the hashed password. This is fine because the password hash
-  // algorithm should never accidently change; if it does we will need to
+  // algorithm should never accidentally change; if it does we will need to
   // have cryptohome migration code and one failing test isn't a problem.
   std::string password = "password";
   std::string hashed_password = "40c7b00f3bccc7675ec5b732de4bfbe4";
   EXPECT_NE(password, hashed_password);
 
   // Verify AuthenticateUser mojo call is run with the same account id, a
   // (hashed) password, and the correct PIN state.
-  EXPECT_CALL(*client, AuthenticateUser(id, hashed_password, false));
-  controller->AuthenticateUser(id, password, false);
+  EXPECT_CALL(*client, AuthenticateUser_(id, hashed_password, false, _));
+  controller->AuthenticateUser(
+      id, password, false, mojom::LockScreenClient::AuthenticateUserCallback());
 
   base::RunLoop().RunUntilIdle();
 }

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

I think this test (or another test) should verify that the callback is actually
called.

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

Done.

 
 TEST_F(LockScreenControllerTest, RequestEasyUnlock) {
   LockScreenController* controller = Shell::Get()->lock_screen_controller();
   std::unique_ptr<MockLockScreenClient> client = BindMockLockScreenClient();
 
   AccountId id = AccountId::FromUserEmail("user1@test.com");
 
   // Verify AttemptUnlock mojo call is run with the same account id.
   EXPECT_CALL(*client, AttemptUnlock(id));
   controller->AttemptUnlock(id);
   base::RunLoop().RunUntilIdle();
 
   // Verify HardlockPod mojo call is run with the same account id.
   EXPECT_CALL(*client, HardlockPod(id));
   controller->HardlockPod(id);
   base::RunLoop().RunUntilIdle();
 
   // Verify RecordClickOnLockIcon mojo call is run with the same account id.
   EXPECT_CALL(*client, RecordClickOnLockIcon(id));
   controller->RecordClickOnLockIcon(id);
   base::RunLoop().RunUntilIdle();
 }
 
 }  // namespace ash