| Index: chrome/browser/chromeos/login/lock/webui_screen_locker.cc
|
| diff --git a/chrome/browser/chromeos/login/lock/webui_screen_locker.cc b/chrome/browser/chromeos/login/lock/webui_screen_locker.cc
|
| index e067ebecf25eb29b883a732815a37003a314ad47..84fbfdab56ab3441dbcedd48f3954d2a2f58cfcc 100644
|
| --- a/chrome/browser/chromeos/login/lock/webui_screen_locker.cc
|
| +++ b/chrome/browser/chromeos/login/lock/webui_screen_locker.cc
|
| @@ -81,22 +81,7 @@ void WebUIScreenLocker::RequestPreload() {
|
|
|
| // static
|
| bool WebUIScreenLocker::ShouldPreloadLockScreen() {
|
| - Profile* profile = ProfileHelper::Get()->GetProfileByUser(
|
| - user_manager::UserManager::Get()->GetActiveUser());
|
| -
|
| - // We only want to preload the lock screen if the user is likely to see the
|
| - // lock screen (since caching the lock screen uses memory). Without
|
| - // preloading, showing the lock screen can take so long we will timeout and
|
| - // crash the browser process (which currently takes down all of Chrome). See
|
| - // crbug.com/452599 for more context.
|
| - //
|
| - // prefs::kEnableAutoScreenLock controls if the lock screen is shown on
|
| - // suspend, so that is our primary hueristic.
|
| -
|
| - // Note that |profile| can be null in tests.
|
| - return base::FeatureList::IsEnabled(features::kPreloadLockScreen) &&
|
| - profile &&
|
| - profile->GetPrefs()->GetBoolean(prefs::kEnableAutoScreenLock);
|
| + return true;
|
| }
|
|
|
| // static
|
|
|