contacts: Rename provider_id to contact_id.

chrome/browser/chromeos/contacts/contact_test_util.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_test_util.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 53 matching lines @@
          base::IntToString(im.protocol()) + "," +
          base::IntToString(im.type().relation()) + "," +
          im.type().label() + "," +
          base::IntToString(im.primary());
 }
 
 }  // namespace
 
 std::string ContactToString(const Contact& contact) {
   std::string result =
-      contact.provider_id() + "," +
+      contact.contact_id() + "," +
       base::Int64ToString(contact.update_time()) + "," +
       base::IntToString(contact.deleted()) + "," +
       contact.full_name() + "," +
       contact.given_name() + "," +
       contact.additional_name() + "," +
       contact.family_name() + "," +
       contact.name_prefix() + "," +
       contact.name_suffix();
 
   SkBitmap bitmap;
@@ skipping 58 matching lines @@
 }
 
 void CopyContacts(const ScopedVector<Contact>& source,
                   ScopedVector<Contact>* dest) {
   ContactPointers pointers;
   for (size_t i = 0; i < source.size(); ++i)
     pointers.push_back(source[i]);
   CopyContacts(pointers, dest);
 }
 
-void InitContact(const std::string& provider_id,
+void InitContact(const std::string& contact_id,
                  const std::string& name_suffix,
                  bool deleted,
                  Contact* contact) {
   DCHECK(contact);
   contact->Clear();
-  contact->set_provider_id(provider_id);
+  contact->set_contact_id(contact_id);
   contact->set_update_time(base::Time::Now().ToInternalValue());
   contact->set_deleted(deleted);
   contact->set_full_name("full_name_" + name_suffix);
   contact->set_given_name("given_name_" + name_suffix);
   contact->set_additional_name("additional_name_" + name_suffix);
   contact->set_family_name("family_name_" + name_suffix);
   contact->set_name_prefix("name_prefix_" + name_suffix);
   contact->set_name_suffix("name_suffix_" + name_suffix);
 }
 
@@ skipping 66 matching lines @@
   SkCanvas canvas(bitmap);
   canvas.clear(SK_ColorBLACK);
 
   std::vector<unsigned char> png_photo;
   CHECK(gfx::PNGCodec::EncodeBGRASkBitmap(bitmap, false, &png_photo));
   contact->set_raw_untrusted_photo(&png_photo[0], png_photo.size());
 }
 
 }  // namespace test
 }  // namespace contacts