contacts: Rename provider_id to contact_id.

chrome/browser/chromeos/contacts/fake_contact_store.h

Index: chrome/browser/chromeos/contacts/fake_contact_store.h
diff --git a/chrome/browser/chromeos/contacts/fake_contact_store.h b/chrome/browser/chromeos/contacts/fake_contact_store.h
index 2a5dd01324aab4d20d10e21347d6811b5ccfea68..43004682941e8020513455060f302a77363b00ca 100644
--- a/chrome/browser/chromeos/contacts/fake_contact_store.h
+++ b/chrome/browser/chromeos/contacts/fake_contact_store.h
@@ -31,7 +31,7 @@ class FakeContactStore : public ContactStore {
   virtual ~FakeContactStore();
 
   // Makes an internal copy of |contacts| so they can be returned by
-  // AppendContacts() and GetContactByProviderId().
+  // AppendContacts() and GetContactById().
   void SetContacts(const ContactPointers& contacts);
 
   // Invokes observers' OnContactsUpdated() methods.
@@ -40,13 +40,12 @@ class FakeContactStore : public ContactStore {
   // ContactStore implementation:
   virtual void Init() OVERRIDE;
   virtual void AppendContacts(ContactPointers* contacts_out) OVERRIDE;
-  virtual const Contact* GetContactByProviderId(
-      const std::string& provider_id) OVERRIDE;
+  virtual const Contact* GetContactById(const std::string& contact_id) OVERRIDE;
   virtual void AddObserver(ContactStoreObserver* observer) OVERRIDE;
   virtual void RemoveObserver(ContactStoreObserver* observer) OVERRIDE;
 
  private:
-  // Map from a contact's provider ID to the contact itself.
+  // Map from a contact's ID to the contact itself.
   typedef std::map<std::string, Contact*> ContactMap;
 
   // Factory that created this store.  Not owned.