contacts: Don't save deleted contacts to disk.

chrome/browser/chromeos/contacts/contact_map.cc

 // Copyright (c) 2012 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/chromeos/contacts/contact_map.h"
 
 #include "chrome/browser/chromeos/contacts/contact.pb.h"
 
 namespace contacts {
 
 ContactMap::ContactMap() : contacts_deleter_(&contacts_) {}
 
 ContactMap::~ContactMap() {}
 
 const Contact* ContactMap::Find(const std::string& contact_id) const {
   Map::const_iterator it = contacts_.find(contact_id);
   return (it != contacts_.end()) ? it->second : NULL;
 }
 
+void ContactMap::Erase(const std::string& contact_id) {
+  Map::iterator it = contacts_.find(contact_id);
+  if (it == contacts_.end())
+    return;
+
+  delete it->second;
+  contacts_.erase(it);
+}
+
 void ContactMap::Clear() {
   STLDeleteValues(&contacts_);
 }
 
 void ContactMap::Merge(scoped_ptr<ScopedVector<Contact> > updated_contacts,
                        DeletedContactPolicy policy) {
   for (ScopedVector<Contact>::iterator it = updated_contacts->begin();
        it != updated_contacts->end(); ++it) {
     Contact* contact = *it;
     Map::iterator map_it = contacts_.find(contact->contact_id());
@@ skipping 13 matching lines @@
         contacts_[contact->contact_id()] = contact;
       }
     }
   }
 
   // Make sure that the Contact objects that we just saved to the map won't be
   // destroyed when |updated_contacts| is destroyed.
   updated_contacts->weak_clear();
 }
 
-base::Time ContactMap::GetMaxUpdateTime() const {
-  base::Time max_update_time;
-  for (const_iterator it = begin(); it != end(); ++it) {
-    const Contact* contact = it->second;
-    const base::Time update_time =
-        base::Time::FromInternalValue(contact->update_time());
-    if (!update_time.is_null() &&
-        (max_update_time.is_null() || max_update_time < update_time)) {
-      max_update_time = update_time;
-    }
-  }
-  return max_update_time;
-}
-
 }  // namespace contacts