Lock profile before sign in when force sign in is enabled.

chrome/browser/signin/chrome_signin_client_unittest.cc

 // Copyright 2015 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 "chrome/browser/signin/chrome_signin_client.h"
 
 #include <memory>
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 115 matching lines @@
 }
 
 #if !defined(OS_ANDROID)
 
 class MockChromeSigninClient : public ChromeSigninClient {
  public:
   MockChromeSigninClient(Profile* profile, SigninErrorController* controller)
       : ChromeSigninClient(profile, controller) {}
 
   MOCK_METHOD1(ShowUserManager, void(const base::FilePath&));
-  MOCK_METHOD1(LockProfile, void(const base::FilePath&));
+  MOCK_METHOD1(LockForceSigninProfile, void(const base::FilePath&));
 };
 
 class MockSigninManager : public SigninManager {
  public:
   explicit MockSigninManager(SigninClient* client)
       : SigninManager(client, nullptr, &fake_service_, nullptr) {}
 
   MOCK_METHOD2(DoSignOut,
                void(signin_metrics::ProfileSignout,
                     signin_metrics::SignoutDelete));
@@ skipping 33 matching lines @@
 };
 
 TEST_F(ChromeSigninClientSignoutTest, SignOut) {
   signin_metrics::ProfileSignout source_metric =
       signin_metrics::ProfileSignout::SIGNOUT_TEST;
   signin_metrics::SignoutDelete delete_metric =
       signin_metrics::SignoutDelete::IGNORE_METRIC;
 
   EXPECT_CALL(*client_, ShowUserManager(browser()->profile()->GetPath()))
       .Times(1);
-  EXPECT_CALL(*client_, LockProfile(browser()->profile()->GetPath())).Times(1);
+  EXPECT_CALL(*client_, LockForceSigninProfile(browser()->profile()->GetPath()))
+      .Times(1);
   EXPECT_CALL(*manager_, DoSignOut(source_metric, delete_metric)).Times(1);
 
   manager_->SignOut(source_metric, delete_metric);
 }
 
 TEST_F(ChromeSigninClientSignoutTest, SignOutWithoutManager) {
   signin_metrics::ProfileSignout source_metric =
       signin_metrics::ProfileSignout::SIGNOUT_TEST;
   signin_metrics::SignoutDelete delete_metric =
       signin_metrics::SignoutDelete::IGNORE_METRIC;
 
   MockSigninManager other_manager(client_.get());
   other_manager.CopyCredentialsFrom(*manager_.get());
 
   EXPECT_CALL(*client_, ShowUserManager(browser()->profile()->GetPath()))
       .Times(0);
-  EXPECT_CALL(*client_, LockProfile(browser()->profile()->GetPath())).Times(1);
+  EXPECT_CALL(*client_, LockForceSigninProfile(browser()->profile()->GetPath()))
+      .Times(1);
   EXPECT_CALL(*manager_, DoSignOut(source_metric, delete_metric)).Times(1);
   manager_->SignOut(source_metric, delete_metric);
 
   ::testing::Mock::VerifyAndClearExpectations(manager_.get());
 
   EXPECT_CALL(*client_, ShowUserManager(browser()->profile()->GetPath()))
       .Times(1);
-  EXPECT_CALL(*client_, LockProfile(browser()->profile()->GetPath())).Times(1);
+  EXPECT_CALL(*client_, LockForceSigninProfile(browser()->profile()->GetPath()))
+      .Times(1);
   EXPECT_CALL(*manager_, DoSignOut(source_metric, delete_metric)).Times(1);
   manager_->SignOut(source_metric, delete_metric);
 }
 
 TEST_F(ChromeSigninClientSignoutTest, SignOutWithoutForceSignin) {
   prefs_->SetBoolean(prefs::kForceBrowserSignin, false);
   CreateClient(browser()->profile());
   manager_.reset(new MockSigninManager(client_.get()));
 
   signin_metrics::ProfileSignout source_metric =
       signin_metrics::ProfileSignout::SIGNOUT_TEST;
   signin_metrics::SignoutDelete delete_metric =
       signin_metrics::SignoutDelete::IGNORE_METRIC;
 
   EXPECT_CALL(*client_, ShowUserManager(browser()->profile()->GetPath()))
       .Times(0);
-  EXPECT_CALL(*client_, LockProfile(browser()->profile()->GetPath())).Times(0);
+  EXPECT_CALL(*client_, LockForceSigninProfile(browser()->profile()->GetPath()))
+      .Times(0);
   EXPECT_CALL(*manager_, DoSignOut(source_metric, delete_metric)).Times(1);
   manager_->SignOut(source_metric, delete_metric);
 }
 
 TEST_F(ChromeSigninClientSignoutTest, SignOutGuestSession) {
   TestingProfile::Builder builder;
   builder.SetGuestSession();
   std::unique_ptr<TestingProfile> profile = builder.Build();
 
   CreateClient(profile.get());
   manager_.reset(new MockSigninManager(client_.get()));
 
   signin_metrics::ProfileSignout source_metric =
       signin_metrics::ProfileSignout::SIGNOUT_TEST;
   signin_metrics::SignoutDelete delete_metric =
       signin_metrics::SignoutDelete::IGNORE_METRIC;
 
   EXPECT_CALL(*client_, ShowUserManager(browser()->profile()->GetPath()))
       .Times(0);
-  EXPECT_CALL(*client_, LockProfile(browser()->profile()->GetPath())).Times(0);
+  EXPECT_CALL(*client_, LockForceSigninProfile(browser()->profile()->GetPath()))
+      .Times(0);
   EXPECT_CALL(*manager_, DoSignOut(source_metric, delete_metric)).Times(1);
   manager_->SignOut(source_metric, delete_metric);
 }
 
 #endif  // !defined(OS_ANDROID)
 #endif  // !defined(OS_CHROMEOS)