Rename avatar_url to icon_url in PasswordForm.

chrome/browser/password_manager/native_backend_libsecret_unittest.cc

Index: chrome/browser/password_manager/native_backend_libsecret_unittest.cc
diff --git a/chrome/browser/password_manager/native_backend_libsecret_unittest.cc b/chrome/browser/password_manager/native_backend_libsecret_unittest.cc
index 45b92ff4dadcdb19dc3a1a90fbaa8ab832520ba5..2bd0f0886f14ee2c2ad6c531aabf6dc4a6be46b8 100644
--- a/chrome/browser/password_manager/native_backend_libsecret_unittest.cc
+++ b/chrome/browser/password_manager/native_backend_libsecret_unittest.cc
@@ -243,7 +243,7 @@ void CheckPasswordChanges(const PasswordStoreChangeList& expected_list,
     EXPECT_EQ(expected.scheme, actual.scheme);
     EXPECT_EQ(expected.date_synced, actual.date_synced);
     EXPECT_EQ(expected.display_name, actual.display_name);
-    EXPECT_EQ(expected.avatar_url, actual.avatar_url);
+    EXPECT_EQ(expected.icon_url, actual.icon_url);
     EXPECT_EQ(expected.federation_url, actual.federation_url);
     EXPECT_EQ(expected.skip_zero_click, actual.skip_zero_click);
     EXPECT_EQ(expected.generation_upload_status,
@@ -284,7 +284,7 @@ class NativeBackendLibsecretTest : public testing::Test {
     form_google_.date_created = base::Time::Now();
     form_google_.date_synced = base::Time::Now();
     form_google_.display_name = UTF8ToUTF16("Joe Schmoe");
-    form_google_.avatar_url = GURL("http://www.google.com/avatar");
+    form_google_.icon_url = GURL("http://www.google.com/icon");
     form_google_.federation_url = GURL("http://www.google.com/federation_url");
     form_google_.skip_zero_click = true;
     form_google_.generation_upload_status = PasswordForm::POSITIVE_SIGNAL_SENT;
@@ -301,7 +301,7 @@ class NativeBackendLibsecretTest : public testing::Test {
     form_facebook_.date_created = base::Time::Now();
     form_facebook_.date_synced = base::Time::Now();
     form_facebook_.display_name = UTF8ToUTF16("Joe Schmoe");
-    form_facebook_.avatar_url = GURL("http://www.facebook.com/avatar");
+    form_facebook_.icon_url = GURL("http://www.facebook.com/icon");
     form_facebook_.federation_url = GURL("http://www.facebook.com/federation");
     form_facebook_.skip_zero_click = true;
     form_facebook_.generation_upload_status = PasswordForm::NO_SIGNAL_SENT;
@@ -387,7 +387,7 @@ class NativeBackendLibsecretTest : public testing::Test {
         item, "date_synced",
         base::Int64ToString(form.date_synced.ToInternalValue()));
     CheckStringAttribute(item, "display_name", UTF16ToUTF8(form.display_name));
-    CheckStringAttribute(item, "avatar_url", form.avatar_url.spec());
+    CheckStringAttribute(item, "avatar_url", form.icon_url.spec());
     CheckStringAttribute(item, "federation_url", form.federation_url.spec());
     CheckUint32Attribute(item, "skip_zero_click", form.skip_zero_click);
     CheckUint32Attribute(item, "generation_upload_status",
@@ -848,7 +848,7 @@ TEST_F(NativeBackendLibsecretTest, SomeKeyringAttributesAreMissing) {
   backend.GetAutofillableLogins(&form_list);
 
   EXPECT_EQ(1u, form_list.size());
-  EXPECT_EQ(GURL(""), form_list[0]->avatar_url);
+  EXPECT_EQ(GURL(""), form_list[0]->icon_url);
   EXPECT_FALSE(form_list[0]->ssl_valid);
 }