contacts: Rename provider_id to contact_id.

chrome/browser/chromeos/gdata/gdata_contacts_service_browsertest.cc

Index: chrome/browser/chromeos/gdata/gdata_contacts_service_browsertest.cc
diff --git a/chrome/browser/chromeos/gdata/gdata_contacts_service_browsertest.cc b/chrome/browser/chromeos/gdata/gdata_contacts_service_browsertest.cc
index 575fc2edc4c1b3a619341790f67f024e240d3979..54c7f48677c2a9eb3afbcfc90a459ac4d5425d3b 100644
--- a/chrome/browser/chromeos/gdata/gdata_contacts_service_browsertest.cc
+++ b/chrome/browser/chromeos/gdata/gdata_contacts_service_browsertest.cc
@@ -42,7 +42,7 @@ const char kGroupsFeedFilename[] = "groups.json";
 const int kPhotoSize = 48;
 
 // Initializes |contact| using the passed-in values.
-void InitContact(const std::string& provider_id,
+void InitContact(const std::string& contact_id,
                  const std::string& rfc_3339_update_time,
                  bool deleted,
                  const std::string& full_name,
@@ -53,7 +53,7 @@ void InitContact(const std::string& provider_id,
                  const std::string& name_suffix,
                  contacts::Contact* contact) {
   DCHECK(contact);
-  contact->set_provider_id(provider_id);
+  contact->set_contact_id(contact_id);
   base::Time update_time;
   CHECK(util::GetTimeFromString(rfc_3339_update_time, &update_time))
       << "Unable to parse time \"" << rfc_3339_update_time << "\"";