Ensure content settings aren't persisted in the guest profile

chrome/browser/content_settings/host_content_settings_map_factory.cc

Index: chrome/browser/content_settings/host_content_settings_map_factory.cc
diff --git a/chrome/browser/content_settings/host_content_settings_map_factory.cc b/chrome/browser/content_settings/host_content_settings_map_factory.cc
index 386c277d856600892a7069382f06bedbdd97bc98..c95b10490d63be38b504458fe240ea563043c7b9 100644
--- a/chrome/browser/content_settings/host_content_settings_map_factory.cc
+++ b/chrome/browser/content_settings/host_content_settings_map_factory.cc
@@ -61,15 +61,16 @@ scoped_refptr<RefcountedKeyedService>
   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 =