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

chrome/browser/content_settings/content_settings_pref_provider.cc

 // Copyright (c) 2011 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/content_settings_pref_provider.h"
 
 #include <map>
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 545 matching lines @@
     int type,
     const NotificationSource& source,
     const NotificationDetails& details) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   if (type == chrome::NOTIFICATION_PREF_CHANGED) {
     DCHECK_EQ(prefs_, Source<PrefService>(source).ptr());
     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);
 
     NotifyObservers(ContentSettingsPattern(),
                     ContentSettingsPattern(),
                     CONTENT_SETTINGS_TYPE_DEFAULT,
                     std::string());
   } else {
     NOTREACHED() << "Unexpected notification";
   }
@@ skipping 643 matching lines @@
           kTypeNames[CONTENT_SETTINGS_TYPE_GEOLOCATION], &setting_value);
 
       UpdateObsoleteGeolocationPref(pattern_pair.first,
                                     pattern_pair.second,
                                     ContentSetting(setting_value));
     }
   }
 }
 
 }  // namespace content_settings