contacts: Rename provider_id to contact_id.

chrome/browser/chromeos/contacts/contact_manager.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/contact_manager.h"
 
 #include "base/logging.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/contacts/contact.pb.h"
 #include "chrome/browser/chromeos/contacts/contact_manager_observer.h"
@@ skipping 88 matching lines @@
 scoped_ptr<ContactPointers> ContactManager::GetAllContacts(Profile* profile) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(profile);
   scoped_ptr<ContactPointers> contacts(new ContactPointers);
   ContactStoreMap::const_iterator it = contact_stores_.find(profile);
   if (it != contact_stores_.end())
     it->second->AppendContacts(contacts.get());
   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;
 }
 
 void ContactManager::OnContactsUpdated(ContactStore* store) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   for (ContactStoreMap::const_iterator it = contact_stores_.begin();
        it != contact_stores_.end(); ++it) {
     if (it->second == store) {
       Profile* profile = it->first;
       Observers* observers = GetObserversForProfile(profile, false);
@@ skipping 74 matching lines @@
   }
 
   ProfileObserversMap::iterator observer_it = profile_observers_.find(profile);
   if (observer_it != profile_observers_.end()) {
     delete observer_it->second;
     profile_observers_.erase(observer_it);
   }
 }
 
 }  // namespace contacts