Cleanup OriginIdentifierValueMap code.

chrome/browser/content_settings/content_settings_origin_identifier_value_map.cc

Index: chrome/browser/content_settings/content_settings_origin_identifier_value_map.cc
diff --git a/chrome/browser/content_settings/content_settings_origin_identifier_value_map.cc b/chrome/browser/content_settings/content_settings_origin_identifier_value_map.cc
index b086f46b2421f3324625c3806008cc76d0cd2694..330ee4972724c9f4d4fe41b78e4e305482befdeb 100644
--- a/chrome/browser/content_settings/content_settings_origin_identifier_value_map.cc
+++ b/chrome/browser/content_settings/content_settings_origin_identifier_value_map.cc
@@ -27,9 +27,7 @@ OriginIdentifierValueMap::Entry::~Entry() {}
 
 OriginIdentifierValueMap::OriginIdentifierValueMap() {}
 
-OriginIdentifierValueMap::~OriginIdentifierValueMap() {
-  Clear();
-}
+OriginIdentifierValueMap::~OriginIdentifierValueMap() {}
 
 bool operator>(const OriginIdentifierValueMap::Entry& first,
                const OriginIdentifierValueMap::Entry& second) {
@@ -108,19 +106,12 @@ void OriginIdentifierValueMap::DeleteValue(
   }
 }
 
-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);
 }