Cleanup OriginIdentifierValueMap code.

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 <string>
 #include <utility>
 #include <vector>
 
@@ skipping 584 matching lines @@
   ContentSettingsDetails details(
       requesting_pattern, content_type, std::string());
   NotifyObservers(details);
 }
 
 void PrefProvider::ResetToDefaults() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   {
     base::AutoLock auto_lock(lock_);
-    value_map_.Clear();
-    incognito_value_map_.Clear();
+    value_map_.clear();
+    incognito_value_map_.clear();
   }
 
   if (!is_incognito_) {
     PrefService* prefs = profile_->GetPrefs();
     updating_preferences_ = true;
     prefs->ClearPref(prefs::kContentSettingsPatterns);
     updating_preferences_ = false;
   }
 }
 
@@ skipping 15 matching lines @@
 
     {
       base::AutoLock auto_lock(lock_);
 
       OriginIdentifierValueMap::iterator entry(map_to_modify->begin());
       while (entry != map_to_modify->end()) {
         if (entry->content_type == content_type) {
           std::string pattern_str = CreatePatternString(
               entry->item_pattern, entry->top_level_frame_pattern);
           // Delete current |entry| and set |entry| to the next value map entry.
-          entry = map_to_modify->DeleteValue(entry);
+          entry = map_to_modify->erase(entry);
 
           // Update the content settings preference.
           if (all_settings_dictionary) {
             // Update the settings dictionary.
             DictionaryValue* settings_dictionary;
             bool found =
                 all_settings_dictionary->GetDictionaryWithoutPathExpansion(
                     pattern_str, &settings_dictionary);
             DCHECK(found);
             settings_dictionary->RemoveWithoutPathExpansion(
@@ skipping 58 matching lines @@
 // Private
 
 void PrefProvider::ReadExceptions(bool overwrite) {
   base::AutoLock auto_lock(lock_);
 
   PrefService* prefs = profile_->GetPrefs();
   const DictionaryValue* all_settings_dictionary =
       prefs->GetDictionary(prefs::kContentSettingsPatterns);
 
   if (overwrite)
-    value_map_.Clear();
+    value_map_.clear();
 
   updating_preferences_ = true;
   // Careful: The returned value could be NULL if the pref has never been set.
   if (all_settings_dictionary != NULL) {
     DictionaryPrefUpdate update(prefs, prefs::kContentSettingsPatterns);
     DictionaryValue* mutable_settings;
     scoped_ptr<DictionaryValue> mutable_settings_scope;
 
     if (!is_incognito_) {
       mutable_settings = update.Get();
@@ skipping 213 matching lines @@
                         ContentSettingsPattern::FromString(host),
                         CONTENT_SETTINGS_TYPE_POPUPS,
                         "",
                         CONTENT_SETTING_ALLOW);
     }
     prefs->ClearPref(prefs::kPopupWhitelistedHosts);
   }
 }
 
 }  // namespace content_settings