Ensure content settings aren't persisted in the guest profile

chrome/browser/content_settings/host_content_settings_map_factory.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/content_settings/host_content_settings_map_factory.h"
 
 #include <utility>
 
 #include "chrome/browser/profiles/off_the_record_profile_impl.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 43 matching lines @@
 HostContentSettingsMapFactory* HostContentSettingsMapFactory::GetInstance() {
   return base::Singleton<HostContentSettingsMapFactory>::get();
 }
 
 scoped_refptr<RefcountedKeyedService>
     HostContentSettingsMapFactory::BuildServiceInstanceFor(
     content::BrowserContext* context) const {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
   Profile* profile = static_cast<Profile*>(context);
-  bool off_the_record = profile->GetProfileType() == Profile::INCOGNITO_PROFILE;
 
   // If off the record, retrieve the host content settings map of the parent
   // profile in order to ensure the preferences have been migrated.
-  if (off_the_record)
+  if (profile->GetProfileType() == Profile::INCOGNITO_PROFILE)
     GetForProfile(profile->GetOriginalProfile());
 
-  scoped_refptr<HostContentSettingsMap> settings_map(
-      new HostContentSettingsMap(profile->GetPrefs(), off_the_record));
+  scoped_refptr<HostContentSettingsMap> settings_map(new HostContentSettingsMap(
+      profile->GetPrefs(),
+      profile->GetProfileType() == Profile::INCOGNITO_PROFILE,
+      profile->GetProfileType() == Profile::GUEST_PROFILE));
 
 #if defined(ENABLE_EXTENSIONS)
   ExtensionService *ext_service =
       extensions::ExtensionSystem::Get(profile)->extension_service();
   // This may be null in testing or when the extenion_service hasn't been
   // initialized, in which case it will be registered then.
   if (ext_service)
     ext_service->RegisterContentSettings(settings_map.get());
 #endif // defined(ENABLE_EXTENSIONS)
 #if defined(ENABLE_SUPERVISED_USERS)
   SupervisedUserSettingsService* supervised_service =
       SupervisedUserSettingsServiceFactory::GetForProfile(profile);
   // This may be null in testing.
   if (supervised_service) {
     scoped_ptr<content_settings::SupervisedProvider> supervised_provider(
         new content_settings::SupervisedProvider(supervised_service));
     settings_map->RegisterProvider(HostContentSettingsMap::SUPERVISED_PROVIDER,
                                    std::move(supervised_provider));
   }
 #endif // defined(ENABLE_SUPERVISED_USERS)
 
   return settings_map;
 }
 
 content::BrowserContext* HostContentSettingsMapFactory::GetBrowserContextToUse(
     content::BrowserContext* context) const {
   return context;
 }