contacts: Add ContactMap class.

chrome/browser/chromeos/contacts/google_contact_store.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_CONTACTS_GOOGLE_CONTACT_STORE_H_
 #define CHROME_BROWSER_CHROMEOS_CONTACTS_GOOGLE_CONTACT_STORE_H_
 
 #include "chrome/browser/chromeos/contacts/contact_store.h"
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
-#include "base/stl_util.h"
 #include "base/time.h"
 #include "base/timer.h"
+#include "chrome/browser/chromeos/contacts/contact_map.h"
 #include "net/base/network_change_notifier.h"
 
 class Profile;
 
 namespace gdata {
 class GDataContactsServiceInterface;
 }
 
 namespace contacts {
 
@@ skipping 44 matching lines @@
   virtual void AppendContacts(ContactPointers* contacts_out) OVERRIDE;
   virtual const Contact* GetContactById(const std::string& contact_id) OVERRIDE;
   virtual void AddObserver(ContactStoreObserver* observer) OVERRIDE;
   virtual void RemoveObserver(ContactStoreObserver* observer) OVERRIDE;
 
   // net::NetworkChangeNotifier::ConnectionTypeObserver implementation:
   virtual void OnConnectionTypeChanged(
       net::NetworkChangeNotifier::ConnectionType type) OVERRIDE;
 
  private:
-  // Map from a contact's Google-assigned ID to the contact itself.
-  typedef std::map<std::string, Contact*> ContactMap;
-
   // Returns the current time. Uses |current_time_for_testing_| instead if it's
   // set.
   base::Time GetCurrentTime() const;
 
   // Destroys |db_| if non-NULL and resets the pointer.
   // The underlying data is preserved on-disk.
   void DestroyDatabase();
 
   // Asynchronously downloads updated contacts and merges them into |contacts_|.
   void UpdateContacts();
@@ skipping 30 matching lines @@
   // being accessed by the database, we schedule an update.
   void OnDatabaseContactsSaved(bool success);
 
   Profile* profile_;  // not owned
 
   ObserverList<ContactStoreObserver> observers_;
 
   // Owns the pointed-to Contact values.
   ContactMap contacts_;
 
-  // Deletes values in |contacts_|.
-  STLValueDeleter<ContactMap> contacts_deleter_;
-
   // Most-recent time that an entry in |contacts_| has been updated (as reported
   // by Google).
   base::Time last_contact_update_time_;
 
   // Used to download contacts.
   scoped_ptr<gdata::GDataContactsServiceInterface> gdata_service_;
 
   // Used to save contacts to disk and load them at startup. Owns the object.
   ContactDatabaseInterface* db_;
 
@@ skipping 36 matching lines @@
   virtual bool CanCreateContactStoreForProfile(Profile* profile) OVERRIDE;
   virtual ContactStore* CreateContactStore(Profile* profile) OVERRIDE;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(GoogleContactStoreFactory);
 };
 
 }  // namespace contacts
 
 #endif  // CHROME_BROWSER_CHROMEOS_CONTACTS_GOOGLE_CONTACT_STORE_H_