Index: chrome/browser/chromeos/ownership/owner_settings_service_chromeos_factory.cc |
diff --git a/chrome/browser/chromeos/ownership/owner_settings_service_chromeos_factory.cc b/chrome/browser/chromeos/ownership/owner_settings_service_chromeos_factory.cc |
index bbd4ca4800ee58802d4c4206ce751fda85a9880a..f8823ec9d3c8d81170ebdc6fc70998c4991981c7 100644 |
--- a/chrome/browser/chromeos/ownership/owner_settings_service_chromeos_factory.cc |
+++ b/chrome/browser/chromeos/ownership/owner_settings_service_chromeos_factory.cc |
@@ -78,8 +78,10 @@ void OwnerSettingsServiceChromeOSFactory::SetOwnerKeyUtilForTesting( |
KeyedService* OwnerSettingsServiceChromeOSFactory::BuildInstanceFor( |
content::BrowserContext* browser_context) { |
Profile* profile = static_cast<Profile*>(browser_context); |
- if (profile->IsGuestSession() || ProfileHelper::IsSigninProfile(profile)) |
- return NULL; |
+ if (profile->IsGuestSession() || ProfileHelper::IsSigninProfile(profile) || |
+ ProfileHelper::IsLockScreenAppProfile(profile)) { |
+ return nullptr; |
+ } |
return new OwnerSettingsServiceChromeOS( |
GetDeviceSettingsService(), |
profile, |