contacts: Add ContactMap class.

chrome/browser/chromeos/contacts/google_contact_store.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/google_contact_store.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/file_path.h"
@@ skipping 65 matching lines @@
 void GoogleContactStore::TestAPI::NotifyAboutNetworkStateChange(bool online) {
   net::NetworkChangeNotifier::ConnectionType type =
       online ?
       net::NetworkChangeNotifier::CONNECTION_UNKNOWN :
       net::NetworkChangeNotifier::CONNECTION_NONE;
   store_->OnConnectionTypeChanged(type);
 }
 
 GoogleContactStore::GoogleContactStore(Profile* profile)
     : profile_(profile),
-      contacts_deleter_(&contacts_),
       db_(new ContactDatabase),
       update_delay_on_next_failure_(
           base::TimeDelta::FromSeconds(kUpdateFailureInitialRetrySec)),
       is_online_(true),
       should_update_when_online_(false),
       ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   net::NetworkChangeNotifier::AddConnectionTypeObserver(this);
   is_online_ = !net::NetworkChangeNotifier::IsOffline();
 }
@@ skipping 28 matching lines @@
   for (ContactMap::const_iterator it = contacts_.begin();
        it != contacts_.end(); ++it) {
     if (!it->second->deleted())
       contacts_out->push_back(it->second);
   }
 }
 
 const Contact* GoogleContactStore::GetContactById(
     const std::string& contact_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  ContactMap::const_iterator it = contacts_.find(contact_id);
-  return (it != contacts_.end() && !it->second->deleted()) ? it->second : NULL;
+  const Contact* contact = contacts_.Find(contact_id);
+  return (contact && !contact->deleted()) ? contact : NULL;
 }
 
 void GoogleContactStore::AddObserver(ContactStoreObserver* observer) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(observer);
   observers_.AddObserver(observer);
 }
 
 void GoogleContactStore::RemoveObserver(ContactStoreObserver* observer) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
@@ skipping 87 matching lines @@
   VLOG(1) << "Scheduling update of " << profile_->GetProfileName()
           << " in " << delay.InSeconds() << " second(s)";
   update_timer_.Start(
       FROM_HERE, delay, this, &GoogleContactStore::UpdateContacts);
 }
 
 void GoogleContactStore::MergeContacts(
     bool is_full_update,
     scoped_ptr<ScopedVector<Contact> > updated_contacts) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  if (is_full_update) {
-    STLDeleteValues(&contacts_);
-    contacts_.clear();
-  }
+  if (is_full_update)
+    contacts_.Clear();
+  size_t num_updated_contacts = updated_contacts->size();
+  contacts_.Merge(updated_contacts.Pass(), ContactMap::KEEP_DELETED_CONTACTS);
 
-  for (ScopedVector<Contact>::iterator it = updated_contacts->begin();
-       it != updated_contacts->end(); ++it) {
-    Contact* contact = *it;
-    VLOG(1) << "Updating " << contact->contact_id();
-    ContactMap::iterator map_it = contacts_.find(contact->contact_id());
-    if (map_it == contacts_.end()) {
-      contacts_[contact->contact_id()] = contact;
-    } else {
-      delete map_it->second;
-      map_it->second = contact;
-    }
-  }
-
-  // Make sure that the Contact objects won't be destroyed when
-  // |updated_contacts| is destroyed.
-  size_t num_updated_contacts = updated_contacts->size();
-  updated_contacts->weak_clear();
-
-  if (is_full_update || num_updated_contacts > 0) {
-    // Find the latest update time.
-    last_contact_update_time_ = base::Time();
-    for (ContactMap::const_iterator it = contacts_.begin();
-         it != contacts_.end(); ++it) {
-      const Contact* contact = it->second;
-      base::Time update_time =
-          base::Time::FromInternalValue(contact->update_time());
-
-      if (!update_time.is_null() &&
-          (last_contact_update_time_.is_null() ||
-           last_contact_update_time_ < update_time)) {
-        last_contact_update_time_ = update_time;
-      }
-    }
-  }
+  if (is_full_update || num_updated_contacts > 0)
+    last_contact_update_time_ = contacts_.GetMaxUpdateTime();
   VLOG(1) << "Last contact update time is "
           << (last_contact_update_time_.is_null() ?
               std::string("null") :
               gdata::util::FormatTimeAsString(last_contact_update_time_));
 }
 
 void GoogleContactStore::OnDownloadSuccess(
     bool is_full_update,
     const base::Time& update_start_time,
     scoped_ptr<ScopedVector<Contact> > updated_contacts) {
@@ skipping 110 matching lines @@
   return gdata::util::IsGDataAvailable(profile);
 }
 
 ContactStore* GoogleContactStoreFactory::CreateContactStore(Profile* profile) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(CanCreateContactStoreForProfile(profile));
   return new GoogleContactStore(profile);
 }
 
 }  // namespace contacts