Rename avatar_url to icon_url in PasswordForm.

chrome/browser/ui/views/passwords/credentials_item_view.cc

 // Copyright 2014 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/views/passwords/credentials_item_view.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/passwords/manage_passwords_view_utils.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/autofill/core/common/password_form.h"
@@ skipping 87 matching lines @@
   set_notify_enter_exit_on_child(true);
   // Create an image-view for the avatar. Make sure it ignores events so that
   // the parent can receive the events instead.
   image_view_ = new CircularImageView;
   image_view_->set_interactive(false);
   gfx::Image image = ResourceBundle::GetSharedInstance().GetImageNamed(
       IDR_PROFILE_AVATAR_PLACEHOLDER_LARGE);
   DCHECK(image.Width() >= kAvatarImageSize &&
          image.Height() >= kAvatarImageSize);
   UpdateAvatar(image.AsImageSkia());
-  if (form_->avatar_url.is_valid()) {
+  if (form_->icon_url.is_valid()) {
     // Fetch the actual avatar.
     AccountAvatarFetcher* fetcher = new AccountAvatarFetcher(
-        form_->avatar_url, weak_ptr_factory_.GetWeakPtr());
+        form_->icon_url, weak_ptr_factory_.GetWeakPtr());
     fetcher->Start(request_context);
   }
   AddChildView(image_view_);
 
   ui::ResourceBundle* rb = &ui::ResourceBundle::GetSharedInstance();
   upper_label_ = new views::Label(
       GetUpperLabelText(*form_, style),
       rb->GetFontList(ui::ResourceBundle::BoldFont));
   upper_label_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   AddChildView(upper_label_);
@@ skipping 49 matching lines @@
   upper_label_->SetBoundsRect(gfx::Rect(label_origin, full_name_size));
   if (lower_label_) {
     label_origin.Offset(0, full_name_size.height());
     lower_label_->SetBoundsRect(gfx::Rect(label_origin, username_size));
   }
 }
 
 void CredentialsItemView::UpdateAvatar(const gfx::ImageSkia& image) {
   image_view_->SetImage(ScaleImageForAccountAvatar(image));
 }