contacts: Rename provider_id to contact_id.

chrome/browser/chromeos/contacts/contact_manager.cc

Index: chrome/browser/chromeos/contacts/contact_manager.cc
diff --git a/chrome/browser/chromeos/contacts/contact_manager.cc b/chrome/browser/chromeos/contacts/contact_manager.cc
index c9648a82318369569f1f2349f43cc97824fc6093..ee9db7518ab7a81c9d4cb5afb6fa7db5bb320ae2 100644
--- a/chrome/browser/chromeos/contacts/contact_manager.cc
+++ b/chrome/browser/chromeos/contacts/contact_manager.cc
@@ -106,14 +106,13 @@ scoped_ptr<ContactPointers> ContactManager::GetAllContacts(Profile* profile) {
   return contacts.Pass();
 }
 
-const Contact* ContactManager::GetContactByProviderId(
-    Profile* profile,
-    const std::string& provider_id) {
+const Contact* ContactManager::GetContactById(Profile* profile,
+                                              const std::string& contact_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(profile);
   ContactStoreMap::const_iterator it = contact_stores_.find(profile);
   return it != contact_stores_.end() ?
-         it->second->GetContactByProviderId(provider_id) :
+         it->second->GetContactById(contact_id) :
          NULL;
 }