Rename avatar_url to icon_url in PasswordForm.

components/autofill/core/common/password_form.h

 // Copyright 2013 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.
 
 #ifndef COMPONENTS_AUTOFILL_CORE_COMMON_PASSWORD_FORM_H__
 #define COMPONENTS_AUTOFILL_CORE_COMMON_PASSWORD_FORM_H__
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 228 matching lines @@
   // What information has been sent to the Autofill server about this form.
   GenerationUploadStatus generation_upload_status;
 
   // These following fields are set by a website using the Credential Manager
   // API. They will be empty and remain unused for sites which do not use that
   // API.
   //
   // User friendly name to show in the UI.
   base::string16 display_name;
 
-  // The URL of the user's avatar to display in the UI. Note that the
-  // corresponding property in the Credential Manager is called icon URL.
-  // TODO(msramek): Rename |avatar_url| to |icon_url| to match the naming
-  // in Credential Manager.
-  GURL avatar_url;
+  // The URL of this credential's icon, such as the user's avatar, to display
+  // in the UI.
+  // TODO(msramek): This field was previously named |avatar_url|. It is still
+  // named this way in the password store backends (e.g. the avatar_url column
+  // in the SQL DB of LoginDatabase) and for the purposes of syncing
+  // (i.e in PasswordSpecificsData). Rename these occurrences.
+  GURL icon_url;
 
   // The URL of identity provider used for federated login.
   GURL federation_url;
 
   // If true, Chrome will not return this credential to a site in response to
   // 'navigator.credentials.request()' without user interaction.
   // Once user selects this credential the flag is reseted.
   bool skip_zero_click;
 
   // The layout as determined during parsing. Default value is LAYOUT_OTHER.
@@ skipping 28 matching lines @@
 typedef std::map<base::string16, const PasswordForm*> ConstPasswordFormMap;
 
 // For testing.
 std::ostream& operator<<(std::ostream& os, PasswordForm::Layout layout);
 std::ostream& operator<<(std::ostream& os, const autofill::PasswordForm& form);
 std::ostream& operator<<(std::ostream& os, autofill::PasswordForm* form);
 
 }  // namespace autofill
 
 #endif  // COMPONENTS_AUTOFILL_CORE_COMMON_PASSWORD_FORM_H__