Index: components/content_settings/core/browser/host_content_settings_map.cc |
diff --git a/components/content_settings/core/browser/host_content_settings_map.cc b/components/content_settings/core/browser/host_content_settings_map.cc |
index 67321bd14d92e837c430cad08ea72eb808450eb9..933abcd1acd8380ad87244ad8588351967f659f6 100644 |
--- a/components/content_settings/core/browser/host_content_settings_map.cc |
+++ b/components/content_settings/core/browser/host_content_settings_map.cc |
@@ -171,8 +171,10 @@ HostContentSettingsMap::HostContentSettingsMap(PrefService* prefs, |
default_provider->AddObserver(this); |
content_settings_providers_[DEFAULT_PROVIDER] = default_provider; |
+// ios doesn't have KEYGEN to be migrated. |
+#if !defined(OS_IOS) |
msramek
2016/05/23 14:49:49
To make sure this stays in sync, could we just che
lshang
2016/05/24 11:55:46
Done.
|
MigrateOldSettings(); |
- |
+#endif |
RecordNumberOfExceptions(); |
} |