Migrate geolocation settings to host content settings map.

chrome/browser/content_settings/content_settings_pref_provider.h

Index: chrome/browser/content_settings/content_settings_pref_provider.h
diff --git a/chrome/browser/content_settings/content_settings_pref_provider.h b/chrome/browser/content_settings/content_settings_pref_provider.h
index 9c717a2fa785dab2474d2239b6e6a29aa5459e13..80dc6814ec238bbcb2790741323307a7df6db22b 100644
--- a/chrome/browser/content_settings/content_settings_pref_provider.h
+++ b/chrome/browser/content_settings/content_settings_pref_provider.h
@@ -134,8 +134,6 @@ class PrefProvider : public ObservableProvider,
                        const NotificationDetails& details);
 
  private:
-  void Init();
-
   // Reads all content settings exceptions from the preference and load them
   // into the |value_map_|. The |value_map_| is cleared first if |overwrite| is
   // true.
@@ -152,7 +150,7 @@ class PrefProvider : public ObservableProvider,
 
   // Update the preference prefs::kContentSettingsPatternPairs, which is used to
   // persist content settigns exceptions and supposed to replace the preferences

[Bernhard Bauer, 2011/08/03 15:22:50]

Nit: "settings".

[markusheintz_, 2011/08/04 12:45:56]

Done.

-  // prefs::kContentSettingsPatterns.
+  // prefs::kContentSettingsPatterns and prefs::kGeolocationContentSettings.
   void UpdatePatternPairsPref(
       const ContentSettingsPattern& primary_pattern,
       const ContentSettingsPattern& secondary_pattern,
@@ -162,7 +160,7 @@ class PrefProvider : public ObservableProvider,
 
   // Updates the preferences prefs::kContentSettingsPatterns. This preferences
   // is obsolete and only used for compatibility reasons.
-  void UpdatePatternsPref(
+  void UpdateObsoletePatternsPref(
       const ContentSettingsPattern& primary_pattern,
       const ContentSettingsPattern& secondary_pattern,
       ContentSettingsType content_type,
@@ -174,12 +172,19 @@ class PrefProvider : public ObservableProvider,
   void MigrateObsoletePerhostPref();
   void MigrateObsoletePopupsPref();
   void MigrateObsoleteContentSettingsPatternPref();
+  void MigrateObsoleteGeolocationPref();
 
   // Copies the value of the preference that stores the content settings
   // exceptions to the obsolete preference for content settings exceptions. This
   // is necessary to allow content settings exceptions beeing synced to older
-  // versions of chrome that only use the obsolete.
-  void SyncObsoletePref();
+  // versions of chrome that only use the obsolete preference.
+  void SyncObsoletePatternPref();
+
+  // Copies geolocation content settings exceptions to the obsolete preference

[Bernhard Bauer, 2011/08/03 15:22:50]

Can you explain that it copies from the new preference to the obsolete one?

[markusheintz_, 2011/08/04 12:45:56]

Done.

+  // for geolocation content settings exceptions. This is necessary to allow
+  // geolocation content settings exceptions beeing synced to older versions of

[Bernhard Bauer, 2011/08/03 15:22:50]

Nit: "being"

[markusheintz_, 2011/08/04 12:45:56]

Done.

+  // chrome that only use the obsolete preference.
+  void SyncObsoleteGeolocationPref();
 
   static void CanonicalizeContentSettingsExceptions(
       base::DictionaryValue* all_settings_dictionary);