contacts: Rename provider_id to contact_id.

chrome/browser/chromeos/contacts/contact_manager.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_CONTACTS_CONTACT_MANAGER_H_
 #define CHROME_BROWSER_CHROMEOS_CONTACTS_CONTACT_MANAGER_H_
 
 #include <map>
 #include <vector>
 
@@ skipping 34 matching lines @@
 
   // Adds or removes an observer for changes to |profile|'s contacts.
   void AddObserver(ContactManagerObserver* observer, Profile* profile);
   void RemoveObserver(ContactManagerObserver* observer, Profile* profile);
 
   // Returns pointers to all currently-loaded contacts for |profile|.  The
   // returned Contact objects may not persist indefinitely; the caller must not
   // refer to them again after unblocking the UI thread.
   scoped_ptr<ContactPointers> GetAllContacts(Profile* profile);
 
-  // Returns the contact identified by |provider_id|.
+  // Returns the contact identified by |contact_id|.
   // NULL is returned if the contact doesn't exist.
-  const Contact* GetContactByProviderId(Profile* profile,
-                                        const std::string& provider_id);
+  const Contact* GetContactById(Profile* profile,
+                                const std::string& contact_id);
 
   // ContactStoreObserver overrides:
   virtual void OnContactsUpdated(ContactStore* store) OVERRIDE;
 
   // content::NotificationObserver overrides:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
  private:
@@ skipping 26 matching lines @@
 
   // Deletes values in |contact_stores_|.
   STLValueDeleter<ContactStoreMap> contact_stores_deleter_;
 
   DISALLOW_COPY_AND_ASSIGN(ContactManager);
 };
 
 }  // namespace contacts
 
 #endif  // CHROME_BROWSER_CHROMEOS_CONTACTS_CONTACT_MANAGER_H_