Don't sync or migrate obsolete preferences in the incognito host content settings map.

BUG=93366
TEST=TODO


Review URL: http://codereview.chromium.org/7740011

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98224 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 14 insertions, 12 deletions

diff --git a/chrome/browser/content_settings/content_settings_pref_provider.cc b/chrome/browser/content_settings/content_settings_pref_provider.cc
index fcc9f19..37f60c1 100644
--- a/chrome/browser/content_settings/content_settings_pref_provider.cc
+++ b/chrome/browser/content_settings/content_settings_pref_provider.cc
@@ -563,18 +563,20 @@ void PrefProvider::Observe(
     if (updating_preferences_)
       return;
 
-    AutoReset<bool> auto_reset(&updating_preferences_, true);
-    std::string* name = Details<std::string>(details).ptr();
-    if (*name == prefs::kContentSettingsPatternPairs) {
-      SyncObsoletePatternPref();
-      SyncObsoleteGeolocationPref();
-    } else if (*name == prefs::kContentSettingsPatterns) {
-      MigrateObsoleteContentSettingsPatternPref();
-    } else if (*name == prefs::kGeolocationContentSettings) {
-      MigrateObsoleteGeolocationPref();
-    } else {
-      NOTREACHED() << "Unexpected preference observed";
-      return;
+    if (!is_incognito_) {
+      AutoReset<bool> auto_reset(&updating_preferences_, true);
+      std::string* name = Details<std::string>(details).ptr();
+      if (*name == prefs::kContentSettingsPatternPairs) {
+        SyncObsoletePatternPref();
+        SyncObsoleteGeolocationPref();
+      } else if (*name == prefs::kContentSettingsPatterns) {
+        MigrateObsoleteContentSettingsPatternPref();
+      } else if (*name == prefs::kGeolocationContentSettings) {
+        MigrateObsoleteGeolocationPref();
+      } else {
+        NOTREACHED() << "Unexpected preference observed";
+        return;
+      }
     }
     ReadContentSettingsFromPref(true);