Rename avatar_url to icon_url in PasswordForm.

chrome/browser/password_manager/native_backend_gnome_x_unittest.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 <stdarg.h>
 
 #include "base/basictypes.h"
 #include "base/location.h"
 #include "base/prefs/pref_service.h"
 #include "base/single_thread_task_runner.h"
@@ skipping 290 matching lines @@
     EXPECT_EQ(expected.signon_realm, actual.signon_realm);
     EXPECT_EQ(expected.ssl_valid, actual.ssl_valid);
     EXPECT_EQ(expected.preferred, actual.preferred);
     EXPECT_EQ(expected.date_created, actual.date_created);
     EXPECT_EQ(expected.blacklisted_by_user, actual.blacklisted_by_user);
     EXPECT_EQ(expected.type, actual.type);
     EXPECT_EQ(expected.times_used, actual.times_used);
     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,
               actual.generation_upload_status);
   }
 }
 
 void CheckPasswordChangesWithResult(const PasswordStoreChangeList* expected,
                                     const PasswordStoreChangeList* actual,
                                     bool result) {
@@ skipping 29 matching lines @@
     form_google_.username_element = UTF8ToUTF16("user");
     form_google_.username_value = UTF8ToUTF16("joeschmoe");
     form_google_.password_element = UTF8ToUTF16("pass");
     form_google_.password_value = UTF8ToUTF16("seekrit");
     form_google_.submit_element = UTF8ToUTF16("submit");
     form_google_.signon_realm = "http://www.google.com/";
     form_google_.type = PasswordForm::TYPE_GENERATED;
     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;
     form_google_.form_data.name = UTF8ToUTF16("form_name");
 
     form_facebook_.origin = GURL("http://www.facebook.com/");
     form_facebook_.action = GURL("http://www.facebook.com/login");
     form_facebook_.username_element = UTF8ToUTF16("user");
     form_facebook_.username_value = UTF8ToUTF16("a");
     form_facebook_.password_element = UTF8ToUTF16("password");
     form_facebook_.password_value = UTF8ToUTF16("b");
     form_facebook_.submit_element = UTF8ToUTF16("submit");
     form_facebook_.signon_realm = "http://www.facebook.com/";
     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;
 
     form_isc_.origin = GURL("http://www.isc.org/");
     form_isc_.action = GURL("http://www.isc.org/auth");
     form_isc_.username_element = UTF8ToUTF16("id");
     form_isc_.username_value = UTF8ToUTF16("janedoe");
     form_isc_.password_element = UTF8ToUTF16("passwd");
     form_isc_.password_value = UTF8ToUTF16("ihazabukkit");
@@ skipping 78 matching lines @@
     CheckUint32Attribute(item, "ssl_valid", form.ssl_valid);
     CheckUint32Attribute(item, "preferred", form.preferred);
     // We don't check the date created. It varies.
     CheckUint32Attribute(item, "blacklisted_by_user", form.blacklisted_by_user);
     CheckUint32Attribute(item, "type", form.type);
     CheckUint32Attribute(item, "times_used", form.times_used);
     CheckUint32Attribute(item, "scheme", form.scheme);
     CheckStringAttribute(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",
                          form.generation_upload_status);
     CheckStringAttribute(item, "application", app_string);
     autofill::FormData actual;
     DeserializeFormDataFromBase64String(
         item->attributes.at("form_data").value_string, &actual);
     EXPECT_TRUE(form.form_data.SameFormAs(actual));
   }
@@ skipping 587 matching lines @@
 
 TEST_F(NativeBackendGnomeTest, RemoveLoginsCreatedBetween) {
   CheckRemoveLoginsBetween(CREATED);
 }
 
 TEST_F(NativeBackendGnomeTest, RemoveLoginsSyncedBetween) {
   CheckRemoveLoginsBetween(SYNCED);
 }
 
 // TODO(mdm): add more basic tests here at some point.