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

chrome/browser/signin/chrome_signin_client.cc

 // Copyright 2014 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 <stddef.h>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 414 matching lines @@
     // the new profile soon.
     should_display_user_manager_ = false;
   }
 }
 
 void ChromeSigninClient::OnCloseBrowsersSuccess(
     const base::Callback<void()>& sign_out,
     const base::FilePath& profile_path) {
   SigninClient::PreSignOut(sign_out);
 
-  LockProfile(profile_path);
+  LockForceSigninProfile(profile_path);
   // After sign out, lock the profile and show UserManager if necessary.
   if (should_display_user_manager_) {
     ShowUserManager(profile_path);
   } else {
     should_display_user_manager_ = true;
   }
 }
 
 void ChromeSigninClient::OnCloseBrowsersAborted(
     const base::FilePath& profile_path) {
   should_display_user_manager_ = true;
 }
 
-void ChromeSigninClient::LockProfile(const base::FilePath& profile_path) {
+void ChromeSigninClient::LockForceSigninProfile(
+    const base::FilePath& profile_path) {
   ProfileAttributesEntry* entry;
   bool has_entry =
       g_browser_process->profile_manager()
           ->GetProfileAttributesStorage()
           .GetProfileAttributesWithPath(profile_->GetPath(), &entry);
   if (!has_entry)
     return;
-  entry->SetIsSigninRequired(true);
+  entry->LockForceSigninProfile(true);
 }
 
 void ChromeSigninClient::ShowUserManager(const base::FilePath& profile_path) {
 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
   UserManager::Show(profile_path, profiles::USER_MANAGER_NO_TUTORIAL,
                     profiles::USER_MANAGER_SELECT_PROFILE_NO_ACTION);
 #endif
 }