contacts: Rename provider_id to contact_id.

chrome/browser/chromeos/contacts/google_contact_store.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/contacts/google_contact_store.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/file_path.h"
@@ skipping 105 matching lines @@
 void GoogleContactStore::AppendContacts(ContactPointers* contacts_out) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(contacts_out);
   for (ContactMap::const_iterator it = contacts_.begin();
        it != contacts_.end(); ++it) {
     if (!it->second->deleted())
       contacts_out->push_back(it->second);
   }
 }
 
-const Contact* GoogleContactStore::GetContactByProviderId(
-    const std::string& provider_id) {
+const Contact* GoogleContactStore::GetContactById(
+    const std::string& contact_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  ContactMap::const_iterator it = contacts_.find(provider_id);
+  ContactMap::const_iterator it = contacts_.find(contact_id);
   return (it != contacts_.end() && !it->second->deleted()) ? it->second : NULL;
 }
 
 void GoogleContactStore::AddObserver(ContactStoreObserver* observer) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(observer);
   observers_.AddObserver(observer);
 }
 
 void GoogleContactStore::RemoveObserver(ContactStoreObserver* observer) {
@@ skipping 102 matching lines @@
     scoped_ptr<ScopedVector<Contact> > updated_contacts) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   if (is_full_update) {
     STLDeleteValues(&contacts_);
     contacts_.clear();
   }
 
   for (ScopedVector<Contact>::iterator it = updated_contacts->begin();
        it != updated_contacts->end(); ++it) {
     Contact* contact = *it;
-    VLOG(1) << "Updating " << contact->provider_id();
-    ContactMap::iterator map_it = contacts_.find(contact->provider_id());
+    VLOG(1) << "Updating " << contact->contact_id();
+    ContactMap::iterator map_it = contacts_.find(contact->contact_id());
     if (map_it == contacts_.end()) {
-      contacts_[contact->provider_id()] = contact;
+      contacts_[contact->contact_id()] = contact;
     } else {
       delete map_it->second;
       map_it->second = contact;
     }
   }
 
   // Make sure that the Contact objects won't be destroyed when
   // |updated_contacts| is destroyed.
   size_t num_updated_contacts = updated_contacts->size();
   updated_contacts->weak_clear();
@@ skipping 134 matching lines @@
   return gdata::util::IsGDataAvailable(profile);
 }
 
 ContactStore* GoogleContactStoreFactory::CreateContactStore(Profile* profile) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(CanCreateContactStoreForProfile(profile));
   return new GoogleContactStore(profile);
 }
 
 }  // namespace contacts