| Index: chrome/browser/content_settings/content_settings_pref_provider.cc
|
| diff --git a/chrome/browser/content_settings/content_settings_pref_provider.cc b/chrome/browser/content_settings/content_settings_pref_provider.cc
|
| index d19fdb3d9489071bc18d2994ef27d89ba87643a4..6dfb9ad87a86f2238ae7c4f50ccc56684d7ffdc2 100644
|
| --- a/chrome/browser/content_settings/content_settings_pref_provider.cc
|
| +++ b/chrome/browser/content_settings/content_settings_pref_provider.cc
|
| @@ -561,7 +561,7 @@ void PrefProvider::MigrateObsoleteContentSettingsPatternPref() {
|
| // Copy the legacy content settings for the current |key| from the
|
| // obsolete pref prefs::kContentSettingsPatterns to the pref
|
| // prefs::kContentSettingsPatternPairs.
|
| - DictionaryValue* dictionary = NULL;
|
| + const DictionaryValue* dictionary = NULL;
|
| bool found = patterns_dictionary->GetDictionaryWithoutPathExpansion(
|
| key, &dictionary);
|
| DCHECK(found);
|
| @@ -599,7 +599,7 @@ void PrefProvider::MigrateObsoleteGeolocationPref() {
|
| GURL primary_url(primary_key);
|
| DCHECK(primary_url.is_valid());
|
|
|
| - DictionaryValue* requesting_origin_settings = NULL;
|
| + const DictionaryValue* requesting_origin_settings = NULL;
|
| // The method GetDictionaryWithoutPathExpansion() returns false if the
|
| // value for the given key is not a |DictionaryValue|. If the value for the
|
| // |primary_key| is not a |DictionaryValue| then the location settings for
|
| @@ -620,7 +620,7 @@ void PrefProvider::MigrateObsoleteGeolocationPref() {
|
| continue;
|
| }
|
|
|
| - base::Value* value = NULL;
|
| + const base::Value* value = NULL;
|
| bool found = requesting_origin_settings->GetWithoutPathExpansion(
|
| secondary_key, &value);
|
| DCHECK(found);
|
|
|