Rename avatar_url to icon_url in PasswordForm.

chrome/browser/password_manager/native_backend_kwallet_x.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/password_manager/native_backend_kwallet_x.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/logging.h"
@@ skipping 185 matching lines @@
       int64 date_synced = 0;
       if (!iter.ReadInt64(&date_synced)) {
         LogDeserializationWarning(version, signon_realm, false);
         return false;
       }
       form->date_synced = base::Time::FromInternalValue(date_synced);
     }
 
     if (version > 3) {
       if (!iter.ReadString16(&form->display_name) ||
-          !ReadGURL(&iter, warn_only, &form->avatar_url) ||
+          !ReadGURL(&iter, warn_only, &form->icon_url) ||
           !ReadGURL(&iter, warn_only, &form->federation_url) ||
           !iter.ReadBool(&form->skip_zero_click)) {
         LogDeserializationWarning(version, signon_realm, false);
         return false;
       }
     }
 
     if (version > 4) {
       form->date_created = base::Time::FromInternalValue(date_created);
     } else {
@@ skipping 38 matching lines @@
     pickle->WriteString16(form->submit_element);
     pickle->WriteBool(form->ssl_valid);
     pickle->WriteBool(form->preferred);
     pickle->WriteBool(form->blacklisted_by_user);
     pickle->WriteInt64(form->date_created.ToInternalValue());
     pickle->WriteInt(form->type);
     pickle->WriteInt(form->times_used);
     autofill::SerializeFormData(form->form_data, pickle);
     pickle->WriteInt64(form->date_synced.ToInternalValue());
     pickle->WriteString16(form->display_name);
-    pickle->WriteString(form->avatar_url.spec());
+    pickle->WriteString(form->icon_url.spec());
     pickle->WriteString(form->federation_url.spec());
     pickle->WriteBool(form->skip_zero_click);
     pickle->WriteInt(form->generation_upload_status);
   }
 }
 
 // Moves the content of |second| to the end of |first|.
 void AppendSecondToFirst(ScopedVector<autofill::PasswordForm>* first,
                          ScopedVector<autofill::PasswordForm> second) {
   first->reserve(first->size() + second.size());
@@ skipping 736 matching lines @@
   }
 
   return handle;
 }
 
 std::string NativeBackendKWallet::GetProfileSpecificFolderName() const {
   // Originally, the folder name was always just "Chrome Form Data".
   // Now we use it to distinguish passwords for different profiles.
   return base::StringPrintf("%s (%d)", kKWalletFolder, profile_id_);
 }