Rename avatar_url to icon_url in PasswordForm.

chrome/browser/ui/cocoa/passwords/credential_item_view_unittest.mm

 // 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.
 
 #import "chrome/browser/ui/cocoa/passwords/credential_item_view.h"
 
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/cocoa/cocoa_test_helper.h"
 #include "testing/gtest_mac.h"
@@ skipping 67 matching lines @@
   autofill::PasswordForm credential;
   credential.username_value = base::ASCIIToUTF16("pizza");
   credential.display_name = base::ASCIIToUTF16("margherita pizza");
   return credential;
 }
 
 // Returns a PasswordForm with a username and avatar URL.
 autofill::PasswordForm CredentialWithAvatar() {
   autofill::PasswordForm credential;
   credential.username_value = base::ASCIIToUTF16("sandwich");
-  credential.avatar_url = GURL("http://sandwich.com/pastrami.jpg");
+  credential.icon_url = GURL("http://sandwich.com/pastrami.jpg");
   return credential;
 }
 
 // Returns a PasswordForm with a username, display name, and avatar URL.
 autofill::PasswordForm CredentialWithNameAndAvatar() {
   autofill::PasswordForm credential;
   credential.username_value = base::ASCIIToUTF16("noodle");
   credential.display_name = base::ASCIIToUTF16("pasta amatriciana");
-  credential.avatar_url = GURL("http://pasta.com/amatriciana.png");
+  credential.icon_url = GURL("http://pasta.com/amatriciana.png");
   return credential;
 }
 
 // Tests for CredentialItemViewTest.
 class CredentialItemViewTest : public CocoaTest {
  protected:
   void SetUp() override {
     delegate_.reset([[CredentialItemTestDelegate alloc] init]);
   }
 
@@ skipping 41 matching lines @@
 }
 
 TEST_F(CredentialItemViewTest, CredentialWithAvatar) {
   autofill::PasswordForm form(CredentialWithAvatar());
   CredentialItemView* item = view(form);
 
   EXPECT_NSEQ(base::SysUTF16ToNSString(form.username_value),
               [item upperLabel].stringValue);
   EXPECT_EQ(nil, [item lowerLabel]);
   EXPECT_TRUE([delegate() didFetchAvatar]);
-  EXPECT_EQ(form.avatar_url, [delegate() fetchedAvatarURL]);
+  EXPECT_EQ(form.icon_url, [delegate() fetchedAvatarURL]);
   EXPECT_EQ(item, [delegate() viewForFetchedAvatar]);
   EXPECT_TRUE(
       ImagesEqual([CredentialItemView defaultAvatar], [item avatarView].image));
 
   [item updateAvatar:nil];
   EXPECT_FALSE([item avatarView].image);
 }
 
 TEST_F(CredentialItemViewTest, CredentialWithNameAndAvatar) {
   autofill::PasswordForm form(CredentialWithNameAndAvatar());
   CredentialItemView* item = view(form);
 
   EXPECT_NSEQ(base::SysUTF16ToNSString(form.display_name),
               [item upperLabel].stringValue);
   EXPECT_NSEQ(base::SysUTF16ToNSString(form.username_value),
               [item lowerLabel].stringValue);
   EXPECT_TRUE([delegate() didFetchAvatar]);
-  EXPECT_EQ(form.avatar_url, [delegate() fetchedAvatarURL]);
+  EXPECT_EQ(form.icon_url, [delegate() fetchedAvatarURL]);
   EXPECT_EQ(item, [delegate() viewForFetchedAvatar]);
   EXPECT_TRUE(
       ImagesEqual([CredentialItemView defaultAvatar], [item avatarView].image));
 
   [item updateAvatar:nil];
   EXPECT_FALSE([item avatarView].image);
 }
 
 }  // namespace