contacts: Rename provider_id to contact_id.

chrome/browser/chromeos/gdata/gdata_contacts_service.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/gdata/gdata_contacts_service.h"
 
 #include <cstring>
 #include <string>
 #include <map>
 #include <utility>
@@ skipping 212 matching lines @@
   }
   return std::string();
 }
 
 // Fills a Contact's fields using an entry from a GData feed.
 bool FillContactFromDictionary(const base::DictionaryValue& dict,
                                contacts::Contact* contact) {
   DCHECK(contact);
   contact->Clear();
 
-  if (!dict.GetString(kIdField, contact->mutable_provider_id()))
+  if (!dict.GetString(kIdField, contact->mutable_contact_id()))
     return false;
 
   std::string updated;
   if (dict.GetString(kUpdatedField, &updated)) {
     base::Time update_time;
     if (!util::GetTimeFromString(updated, &update_time)) {
       LOG(WARNING) << "Unable to parse time \"" << updated << "\"";
       return false;
     }
     contact->set_update_time(update_time.ToInternalValue());
@@ skipping 338 matching lines @@
         return false;
       }
 
       scoped_ptr<contacts::Contact> contact(new contacts::Contact);
       if (!FillContactFromDictionary(*contact_dict, contact.get())) {
         LOG(WARNING) << "Unable to fill entry " << index;
         return false;
       }
 
       VLOG(1) << "Got contact " << index << ":"
-              << " id=" << contact->provider_id()
+              << " id=" << contact->contact_id()
               << " full_name=\"" << contact->full_name() << "\""
               << " update_time=" << contact->update_time();
 
       std::string photo_url = GetPhotoUrl(*contact_dict);
       if (!photo_url.empty()) {
         if (!service_->rewrite_photo_url_callback_for_testing_.is_null()) {
           photo_url =
               service_->rewrite_photo_url_callback_for_testing_.Run(photo_url);
         }
         contact_photo_urls_[contact.get()] = photo_url;
@@ skipping 31 matching lines @@
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
     while (!contacts_needing_photo_downloads_.empty() &&
            (num_in_progress_photo_downloads_ <
             service_->max_photo_downloads_per_second_)) {
       contacts::Contact* contact = contacts_needing_photo_downloads_.back();
       contacts_needing_photo_downloads_.pop_back();
       DCHECK(contact_photo_urls_.count(contact));
       std::string url = contact_photo_urls_[contact];
 
       VLOG(1) << "Starting download of photo " << url << " for "
-              << contact->provider_id();
+              << contact->contact_id();
       runner_->StartOperationWithRetry(
           new GetContactPhotoOperation(
               runner_->operation_registry(),
               GURL(url),
               base::Bind(&DownloadContactsRequest::HandlePhotoData,
                          weak_ptr_factory_.GetWeakPtr(),
                          contact)));
       num_in_progress_photo_downloads_++;
     }
   }
 
   // Callback for GetContactPhotoOperation calls.  Updates the associated
   // Contact and checks for completion.
   void HandlePhotoData(contacts::Contact* contact,
                        GDataErrorCode error,
                        scoped_ptr<std::string> download_data) {
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-    VLOG(1) << "Got photo data for " << contact->provider_id()
+    VLOG(1) << "Got photo data for " << contact->contact_id()
             << " (error=" << error << " size=" << download_data->size() << ")";
     num_in_progress_photo_downloads_--;
 
     if (error == HTTP_INTERNAL_SERVER_ERROR ||
         error == HTTP_SERVICE_UNAVAILABLE) {
       int num_errors = ++transient_photo_download_errors_per_contact_[contact];
       if (num_errors <= kMaxTransientPhotoDownloadErrorsPerContact) {
         LOG(WARNING) << "Got error " << error << " while downloading photo "
-                     << "for " << contact->provider_id() << "; retrying";
+                     << "for " << contact->contact_id() << "; retrying";
         contacts_needing_photo_downloads_.push_back(contact);
         return;
       }
     }
 
     if (error == HTTP_NOT_FOUND) {
       LOG(WARNING) << "Got error " << error << " while downloading photo "
-                   << "for " << contact->provider_id() << "; skipping";
+                   << "for " << contact->contact_id() << "; skipping";
       CheckCompletion();
       return;
     }
 
     if (error != HTTP_SUCCESS) {
       LOG(WARNING) << "Got error " << error << " while downloading photo "
-                   << "for " << contact->provider_id() << "; giving up";
+                   << "for " << contact->contact_id() << "; giving up";
       photo_download_failed_ = true;
       // Make sure we don't start any more downloads.
       contacts_needing_photo_downloads_.clear();
       CheckCompletion();
       return;
     }
 
     contact->set_raw_untrusted_photo(*download_data);
     CheckCompletion();
   }
@@ skipping 85 matching lines @@
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(request);
   VLOG(1) << "Download request " << request << " complete";
   if (!request->my_contacts_group_id().empty())
     cached_my_contacts_group_id_ = request->my_contacts_group_id();
   requests_.erase(request);
   delete request;
 }
 
 }  // namespace contacts