Rename avatar_url to icon_url in PasswordForm.

chrome/browser/ui/android/infobars/account_chooser_infobar.cc

 // Copyright 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/ui/android/infobars/account_chooser_infobar.h"
 
 #include "base/android/scoped_java_ref.h"
 #include "chrome/browser/bitmap_fetcher/bitmap_fetcher.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/password_manager/account_chooser_infobar_delegate_android.h"
@@ skipping 60 matching lines @@
   }
   delete this;
 }
 
 void FetchAvatars(
     const base::android::ScopedJavaGlobalRef<jobject>& java_infobar,
     const std::vector<const autofill::PasswordForm*>& password_forms,
     int index,
     net::URLRequestContextGetter* request_context) {
   for (auto password_form : password_forms) {
-    if (!password_form->avatar_url.is_valid())
+    if (!password_form->icon_url.is_valid())
       continue;
     // Fetcher deletes itself once fetching is finished.
-    auto fetcher = new AvatarFetcherAndroid(password_form->avatar_url, index,
+    auto fetcher = new AvatarFetcherAndroid(password_form->icon_url, index,
                                             java_infobar);
     fetcher->Start(request_context);
     ++index;
   }
 }
 
 };  // namespace
 
 AccountChooserInfoBar::AccountChooserInfoBar(
     scoped_ptr<AccountChooserInfoBarDelegateAndroid> delegate)
@@ skipping 61 matching lines @@
     const base::android::JavaRef<jobject>& java_info_bar) {
   InfoBarAndroid::SetJavaInfoBar(java_info_bar);
   JNIEnv* env = base::android::AttachCurrentThread();
   Java_AccountChooserInfoBar_setNativePtr(env, java_info_bar.obj(),
                                           reinterpret_cast<intptr_t>(this));
 }
 
 bool RegisterAccountChooserInfoBar(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }