Migrate geolocation settings to host content settings map.

chrome/browser/content_settings/content_settings_pref_provider.h

 // 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.
 
 #ifndef CHROME_BROWSER_CONTENT_SETTINGS_CONTENT_SETTINGS_PREF_PROVIDER_H_
 #define CHROME_BROWSER_CONTENT_SETTINGS_CONTENT_SETTINGS_PREF_PROVIDER_H_
 #pragma once
 
 // A content settings provider that takes its settings out of the pref service.
 
@@ skipping 116 matching lines @@
       ContentSettingsType content_type);
 
   virtual void ShutdownOnUIThread();
 
   // NotificationObserver implementation.
   virtual void Observe(int type,
                        const NotificationSource& source,
                        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.
   void ReadContentSettingsFromPref(bool overwrite);
 
   // Update the preference that stores content settings exceptions and syncs the
   // value to the obsolete preference.
   void UpdatePref(
       const ContentSettingsPattern& primary_pattern,
       const ContentSettingsPattern& secondary_pattern,
       ContentSettingsType content_type,
       const ResourceIdentifier& resource_identifier,
       ContentSetting setting);
 
   // 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,
       ContentSettingsType content_type,
       const ResourceIdentifier& resource_identifier,
       ContentSetting setting);
 
   // 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,
       const ResourceIdentifier& resource_identifier,
       ContentSetting setting);
 
   // Various migration methods (old cookie, popup and per-host data gets
   // migrated to the new format).
   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);
 
   // Weak; owned by the Profile and reset in ShutdownOnUIThread.
   PrefService* prefs_;
 
   bool is_incognito_;
 
   PrefChangeRegistrar pref_change_registrar_;
 
   // Whether we are currently updating preferences, this is used to ignore
   // notifications from the preferences service that we triggered ourself.
   bool updating_preferences_;
 
   OriginIdentifierValueMap value_map_;
 
   OriginIdentifierValueMap incognito_value_map_;
 
   // Used around accesses to the value map objects to guarantee
   // thread safety.
   mutable base::Lock lock_;
 
   DISALLOW_COPY_AND_ASSIGN(PrefProvider);
 };
 
 }  // namespace content_settings
 
 #endif  // CHROME_BROWSER_CONTENT_SETTINGS_CONTENT_SETTINGS_PREF_PROVIDER_H_