contacts: Add ContactMap class.

chrome/browser/chromeos/contacts/google_contact_store.h

Index: chrome/browser/chromeos/contacts/google_contact_store.h
diff --git a/chrome/browser/chromeos/contacts/google_contact_store.h b/chrome/browser/chromeos/contacts/google_contact_store.h
index 27ca0886c154e194a036ea27ec0a37dc92eee77f..01bc4d40d5c0b972e3f201ad71c9d962e6e1137f 100644
--- a/chrome/browser/chromeos/contacts/google_contact_store.h
+++ b/chrome/browser/chromeos/contacts/google_contact_store.h
@@ -17,9 +17,9 @@
 #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;
@@ -84,9 +84,6 @@ class GoogleContactStore
       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;
@@ -137,9 +134,6 @@ class GoogleContactStore
   // 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_;