Rename avatar_url to icon_url in PasswordForm.

chrome/browser/password_manager/native_backend_libsecret.cc

 // Copyright (c) 2015 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/password_manager/native_backend_libsecret.h"
 
 #include <dlfcn.h>
 #include <list>
 
 #include "base/basictypes.h"
@@ skipping 168 matching lines @@
       static_cast<PasswordForm::Type>(GetUintFromAttributes(attrs, "type"));
   form->times_used = GetUintFromAttributes(attrs, "times_used");
   form->scheme =
       static_cast<PasswordForm::Scheme>(GetUintFromAttributes(attrs, "scheme"));
   int64 date_synced = 0;
   base::StringToInt64(GetStringFromAttributes(attrs, "date_synced"),
                       &date_synced);
   form->date_synced = base::Time::FromInternalValue(date_synced);
   form->display_name =
       UTF8ToUTF16(GetStringFromAttributes(attrs, "display_name"));
-  form->avatar_url = GURL(GetStringFromAttributes(attrs, "avatar_url"));
+  form->icon_url = GURL(GetStringFromAttributes(attrs, "avatar_url"));
   form->federation_url = GURL(GetStringFromAttributes(attrs, "federation_url"));
   form->skip_zero_click = GetUintFromAttributes(attrs, "skip_zero_click");
   form->generation_upload_status =
       static_cast<PasswordForm::GenerationUploadStatus>(
           GetUintFromAttributes(attrs, "generation_upload_status"));
   base::StringPiece encoded_form_data =
       GetStringFromAttributes(attrs, "form_data");
   if (!encoded_form_data.empty()) {
     bool success = DeserializeFormDataFromBase64String(encoded_form_data,
                                                        &form->form_data);
@@ skipping 248 matching lines @@
       "signon_realm", form.signon_realm.c_str(),
       "ssl_valid", form.ssl_valid,
       "preferred", form.preferred,
       "date_created", base::Int64ToString(date_created).c_str(),
       "blacklisted_by_user", form.blacklisted_by_user,
       "type", form.type,
       "times_used", form.times_used,
       "scheme", form.scheme,
       "date_synced", base::Int64ToString(date_synced).c_str(),
       "display_name", UTF16ToUTF8(form.display_name).c_str(),
-      "avatar_url", form.avatar_url.spec().c_str(),
+      "avatar_url", form.icon_url.spec().c_str(),
       "federation_url", form.federation_url.spec().c_str(),
       "skip_zero_click", form.skip_zero_click,
       "generation_upload_status", form.generation_upload_status,
       "form_data", form_data.c_str(),
       "application", app_string_.c_str(), nullptr);
 
   if (error) {
     VLOG(1) << "Libsecret add raw login failed: " << error->message;
     g_error_free(error);
     return false;
@@ skipping 145 matching lines @@
     UMA_HISTOGRAM_ENUMERATION(
         "PasswordManager.PslDomainMatchTriggering",
         password_manager::ShouldPSLDomainMatchingApply(registered_domain)
             ? psl_domain_match_metric
             : password_manager::PSL_DOMAIN_MATCH_NOT_USED,
         password_manager::PSL_DOMAIN_MATCH_COUNT);
   }
   g_list_free(found);
   return forms.Pass();
 }