contacts: Rename provider_id to contact_id.

chrome/browser/chromeos/contacts/contact_database.cc

Index: chrome/browser/chromeos/contacts/contact_database.cc
diff --git a/chrome/browser/chromeos/contacts/contact_database.cc b/chrome/browser/chromeos/contacts/contact_database.cc
index da7bb88ae818069732f92fab8dee26593df02155..efe3a3d0cc2e4a82e60b8d38b917f5cdafbacc06 100644
--- a/chrome/browser/chromeos/contacts/contact_database.cc
+++ b/chrome/browser/chromeos/contacts/contact_database.cc
@@ -214,15 +214,15 @@ void ContactDatabase::SaveContactsFromTaskRunner(
   for (ContactPointers::const_iterator it = contacts->begin();
        it != contacts->end(); ++it) {
     const contacts::Contact& contact = **it;
-    if (contact.provider_id() == kUpdateMetadataKey) {
+    if (contact.contact_id() == kUpdateMetadataKey) {
       LOG(WARNING) << "Skipping contact with reserved ID "
-                   << contact.provider_id();
+                   << contact.contact_id();
       continue;
     }
-    updates.Put(leveldb::Slice(contact.provider_id()),
+    updates.Put(leveldb::Slice(contact.contact_id()),
                 leveldb::Slice(contact.SerializeAsString()));
     if (is_full_update)
-      keys_to_delete.erase(contact.provider_id());
+      keys_to_delete.erase(contact.contact_id());
   }
 
   for (std::set<std::string>::const_iterator it = keys_to_delete.begin();