AutoFill Prefs dialog on Mac should list derived labels for profiles, not summaries.

chrome/browser/autofill/autofill_dialog_controller_mac_unittest.mm

 // Copyright (c) 2010 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 "base/ref_counted.h"
 #import "chrome/browser/autofill/autofill_address_model_mac.h"
 #import "chrome/browser/autofill/autofill_address_sheet_controller_mac.h"
 #import "chrome/browser/autofill/autofill_credit_card_model_mac.h"
 #import "chrome/browser/autofill/autofill_credit_card_sheet_controller_mac.h"
 #import "chrome/browser/autofill/autofill_dialog_controller_mac.h"
@@ skipping 266 matching lines @@
   EXPECT_TRUE([[am phoneWholeNumber] isEqualToString:@"014155552258"]);
   EXPECT_TRUE([[am faxWholeNumber] isEqualToString:@"024087172258"]);
 
   [sheet save:nil];
   [controller_ save:nil];
 
   ASSERT_TRUE(observer_.hit_);
   ASSERT_TRUE(observer_.profiles_.size() == 1);
 
   profiles()[0]->set_unique_id(observer_.profiles_[0].unique_id());
+  // Do not compare labels.  Label is a derived field.
+  observer_.profiles_[0].set_label(string16());
+  profiles()[0]->set_label(string16());
   ASSERT_EQ(observer_.profiles_[0], *profiles()[0]);
 }
 
 TEST_F(AutoFillDialogControllerTest, CreditCardDataMutation) {
   CreditCard credit_card(ASCIIToUTF16("myCC"), 345);
   credit_card.SetInfo(AutoFillType(CREDIT_CARD_NAME), ASCIIToUTF16("DCH"));
   credit_card.SetInfo(
     AutoFillType(CREDIT_CARD_NUMBER), ASCIIToUTF16("1234 5678 9101 1121"));
   credit_card.SetInfo(AutoFillType(CREDIT_CARD_EXP_MONTH), ASCIIToUTF16("01"));
   credit_card.SetInfo(
@@ skipping 36 matching lines @@
   // Should hit our observer.
   ASSERT_TRUE(observer_.hit_);
 
   // Sizes should match.  And should be 2.
   ASSERT_EQ(observer_.profiles_.size(), profiles().size());
   ASSERT_EQ(observer_.profiles_.size(), 2UL);
 
   // Contents should match.  With the exception of the |unique_id|.
   for (size_t i = 0, count = profiles().size(); i < count; i++) {
     profiles()[i]->set_unique_id(observer_.profiles_[i].unique_id());
+
+    // Do not compare labels.  Label is a derived field.
+    observer_.profiles_[i].set_label(string16());
+    profiles()[i]->set_label(string16());
     ASSERT_EQ(observer_.profiles_[i], *profiles()[i]);
   }
 }
 
 TEST_F(AutoFillDialogControllerTest, TwoCreditCards) {
   CreditCard credit_card1(ASCIIToUTF16("Visa"), 1);
   credit_card1.SetInfo(AutoFillType(CREDIT_CARD_NAME), ASCIIToUTF16("Joe"));
   credit_cards().push_back(&credit_card1);
   CreditCard credit_card2(ASCIIToUTF16("Mastercard"), 2);
   credit_card2.SetInfo(AutoFillType(CREDIT_CARD_NAME), ASCIIToUTF16("Bob"));
@@ skipping 110 matching lines @@
 
   // Should hit our observer.
   ASSERT_TRUE(observer_.hit_);
 
   // Sizes should match be different.  New size should be 0.
   ASSERT_NE(observer_.profiles_.size(), profiles().size());
   ASSERT_EQ(observer_.profiles_.size(), 1UL);
 
   // First address should match.
   profiles()[0]->set_unique_id(observer_.profiles_[0].unique_id());
+
+  // Do not compare labels.  Label is a derived field.
+  observer_.profiles_[0].set_label(string16());
+  profile.set_label(string16());
   ASSERT_EQ(observer_.profiles_[0], profile);
 }
 
 TEST_F(AutoFillDialogControllerTest, TwoCreditCardsDeleteOne) {
   CreditCard credit_card(ASCIIToUTF16("Visa"), 1);
   credit_card.SetInfo(AutoFillType(CREDIT_CARD_NAME), ASCIIToUTF16("Joe"));
   credit_cards().push_back(&credit_card);
   CreditCard credit_card2(ASCIIToUTF16("Mastercard"), 2);
   credit_card2.SetInfo(AutoFillType(CREDIT_CARD_NAME), ASCIIToUTF16("Bob"));
   credit_cards().push_back(&credit_card2);
@@ skipping 68 matching lines @@
   // Should hit our observer.
   ASSERT_TRUE(observer_.hit_);
 
   // Sizes should match.
   ASSERT_EQ(observer_.profiles_.size(), profiles().size());
   ASSERT_EQ(observer_.credit_cards_.size(), credit_cards().size());
 
   // Contents should match.
   size_t i = 0;
   size_t count = profiles().size();
-  for (i = 0; i < count; i++)
+  for (i = 0; i < count; i++) {
+    // Do not compare labels.  Label is a derived field.
+    observer_.profiles_[i].set_label(string16());
+    profiles()[i]->set_label(string16());
     ASSERT_EQ(observer_.profiles_[i], *profiles()[i]);
+  }
   count = credit_cards().size();
   for (i = 0; i < count; i++) {
     ASSERT_EQ(observer_.credit_cards_[i], *credit_cards()[i]);
   }
 }
 
 TEST_F(AutoFillDialogControllerTest, ImportedParameters) {
   AutoFillProfile profile(ASCIIToUTF16("Home"), 0);
   imported_profile_ = &profile;
   CreditCard credit_card(ASCIIToUTF16("Mastercard"), 0);
@@ skipping 10 matching lines @@
   LoadDialog();
   [controller_ save:nil];
 
   // Should hit our observer.
   ASSERT_TRUE(observer_.hit_);
 
   // Sizes should match.
   ASSERT_EQ(1UL, observer_.profiles_.size());
   ASSERT_EQ(1UL, observer_.credit_cards_.size());
 
+  // Do not compare labels.  Label is a derived field.
+  observer_.profiles_[0].set_label(string16());
+  profile.set_label(string16());
+
   // Contents should match.
   ASSERT_EQ(observer_.profiles_[0], profile);
   ASSERT_EQ(observer_.credit_cards_[0], credit_card);
 }
 
 // AutoFill is enabled by default.
 TEST_F(AutoFillDialogControllerTest, AutoFillEnabledTrue) {
   LoadDialog();
   [controller_ save:nil];
 
@@ skipping 27 matching lines @@
 
   // Should hit our observer.
   ASSERT_TRUE(observer_.hit_);
 
   // Auxiliary profiles setting should be unchanged.
   ASSERT_TRUE(helper_.profile()->GetPrefs()->GetBoolean(
       prefs::kAutoFillEnabled));
 }
 
 }  // namespace