Cleanup OriginIdentifierValueMap code.

chrome/browser/content_settings/content_settings_origin_identifier_value_map.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_origin_identifier_value_map.h"
 
 #include "base/logging.h"
 #include "base/values.h"
 #include "googleurl/src/gurl.h"
 
 namespace content_settings {
 
 OriginIdentifierValueMap::Entry::Entry(
     ContentSettingsPattern item_pattern,
     ContentSettingsPattern top_level_frame_pattern,
     ContentSettingsType content_type,
     OriginIdentifierValueMap::ResourceIdentifier identifier,
     Value* value)
     : item_pattern(item_pattern),
       top_level_frame_pattern(top_level_frame_pattern),
       content_type(content_type),
       identifier(identifier),
       value(value) {
 }
 
 OriginIdentifierValueMap::Entry::~Entry() {}
 
 OriginIdentifierValueMap::OriginIdentifierValueMap() {}
 
-OriginIdentifierValueMap::~OriginIdentifierValueMap() {
-  Clear();
-}
+OriginIdentifierValueMap::~OriginIdentifierValueMap() {}
 
 bool operator>(const OriginIdentifierValueMap::Entry& first,
                const OriginIdentifierValueMap::Entry& second) {
   // Compare item patterns.
   if (first.item_pattern > second.item_pattern)
     return true;
   if (first.item_pattern < second.item_pattern)
     return false;
 
   // Compare top_level_frame patterns.
@@ skipping 58 matching lines @@
   OriginIdentifierValueMap::iterator entry_to_delete =
       FindEntry(item_pattern,
                 top_level_frame_pattern,
                 content_type,
                 resource_identifier);
   if (entry_to_delete != entries_.end()) {
     entries_.erase(entry_to_delete);
   }
 }
 
-void OriginIdentifierValueMap::Clear() {
+void OriginIdentifierValueMap::clear() {
   // Delete all owned value objects.
-  /*
-  for (OriginIdentifierValueMap::iterator entry = entries_.begin();
-       entry != entries_.end();
-       ++entry) {
-    delete entry->value;
-  }
-  */
   entries_.clear();
 }
 
-OriginIdentifierValueMap::iterator OriginIdentifierValueMap::DeleteValue(
+OriginIdentifierValueMap::iterator OriginIdentifierValueMap::erase(
     OriginIdentifierValueMap::iterator entry) {
   return entries_.erase(entry);
 }
 
 OriginIdentifierValueMap::iterator OriginIdentifierValueMap::FindEntry(
       const ContentSettingsPattern& item_pattern,
       const ContentSettingsPattern& top_level_frame_pattern,
       ContentSettingsType content_type,
       const ResourceIdentifier& resource_identifier) {
   for (OriginIdentifierValueMap::iterator entry = entries_.begin();
        entry != entries_.end();
        ++entry) {
     if (item_pattern == entry->item_pattern &&
         top_level_frame_pattern == entry->top_level_frame_pattern &&
         content_type == entry->content_type &&
         resource_identifier == entry->identifier) {
       return entry;
     }
   }
   return entries_.end();
 }
 
 }  // namespace content_settings