contacts: Rename provider_id to contact_id.

chrome/browser/chromeos/gdata/gdata_contacts_service_browsertest.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 "base/bind.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/message_loop.h"
@@ skipping 24 matching lines @@
 // Base URL where feeds are located on the test server.
 const char kFeedBaseUrl[] = "files/chromeos/gdata/contacts/";
 
 // Filename of JSON feed containing contact groups.
 const char kGroupsFeedFilename[] = "groups.json";
 
 // Width and height of /photo.png on the test server.
 const int kPhotoSize = 48;
 
 // Initializes |contact| using the passed-in values.
-void InitContact(const std::string& provider_id,
+void InitContact(const std::string& contact_id,
                  const std::string& rfc_3339_update_time,
                  bool deleted,
                  const std::string& full_name,
                  const std::string& given_name,
                  const std::string& additional_name,
                  const std::string& family_name,
                  const std::string& name_prefix,
                  const std::string& name_suffix,
                  contacts::Contact* contact) {
   DCHECK(contact);
-  contact->set_provider_id(provider_id);
+  contact->set_contact_id(contact_id);
   base::Time update_time;
   CHECK(util::GetTimeFromString(rfc_3339_update_time, &update_time))
       << "Unable to parse time \"" << rfc_3339_update_time << "\"";
   contact->set_update_time(update_time.ToInternalValue());
   contact->set_deleted(deleted);
   contact->set_full_name(full_name);
   contact->set_given_name(given_name);
   contact->set_additional_name(additional_name);
   contact->set_family_name(family_name);
   contact->set_name_prefix(name_prefix);
@@ skipping 219 matching lines @@
                 "2012-06-04T15:53:36.023Z",
                 false, "", "", "", "", "", "", contact);
     contacts::test::SetPhoto(gfx::Size(kPhotoSize, kPhotoSize), contact);
     expected_contacts.push_back(contact);
   }
   EXPECT_EQ(contacts::test::ContactsToString(expected_contacts),
             contacts::test::ContactsToString(*contacts));
 }
 
 }  // namespace gdata