AutoFill Mac dialog should be non-modal

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"
 #include "base/utf_string_conversions.h"
 #include "base/values.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"
@@ skipping 133 matching lines @@
 class AutoFillDialogControllerTest : public CocoaTest {
  public:
   AutoFillDialogControllerTest()
       : controller_(nil),
         imported_profile_(NULL),
         imported_credit_card_(NULL) {
   }
 
   void LoadDialog() {
     controller_ = [AutoFillDialogController
-        controllerWithObserver:&observer_
-                       profile:helper_.profile()
-               importedProfile:imported_profile_
-            importedCreditCard:imported_credit_card_];
-    [controller_ window];
+        controllerWithObserver:&observer_ profile:helper_.profile()];
+    [controller_ runModelessDialog];
   }
 
   std::vector<AutoFillProfile*>& profiles() {
     return helper_.test_profile_->test_manager_->test_profiles_;
   }
   std::vector<CreditCard*>& credit_cards() {
     return helper_.test_profile_->test_manager_->test_credit_cards_;
   }
 
   BrowserMock helper_;
   AutoFillDialogObserverMock observer_;
   AutoFillDialogController* controller_;  // weak reference
   AutoFillProfile* imported_profile_;  // weak reference
   CreditCard* imported_credit_card_;  // weak reference
 
  private:
   DISALLOW_COPY_AND_ASSIGN(AutoFillDialogControllerTest);
 };
 
-TEST_F(AutoFillDialogControllerTest, SaveButtonInformsObserver) {
+TEST_F(AutoFillDialogControllerTest, CloseButtonDoesNotInformObserver) {
   LoadDialog();
-  [controller_ save:nil];
-  ASSERT_TRUE(observer_.hit_);
-}
-
-TEST_F(AutoFillDialogControllerTest, CancelButtonDoesNotInformObserver) {
-  LoadDialog();
-  [controller_ cancel:nil];
+  [controller_ closeDialog];
   ASSERT_FALSE(observer_.hit_);
 }
 
-TEST_F(AutoFillDialogControllerTest, NoEditsGiveBackOriginalProfile) {
+TEST_F(AutoFillDialogControllerTest, NoEditsDoNotChangeObserverProfiles) {
   AutoFillProfile profile;
   profiles().push_back(&profile);
   LoadDialog();
-  [controller_ save:nil];
+  [controller_ closeDialog];
 
-  // Should hit our observer.
-  ASSERT_TRUE(observer_.hit_);
+  // Should not hit our observer.
+  ASSERT_FALSE(observer_.hit_);
 
-  // Sizes should match.
-  ASSERT_EQ(observer_.profiles_.size(), profiles().size());
-
-  // Contents should match.
-  size_t i = 0;
-  size_t count = profiles().size();
-  for (i = 0; i < count; i++)
-    ASSERT_EQ(observer_.profiles_[i], *profiles()[i]);
-
-  // Contents should not match a different profile.
-  AutoFillProfile different_profile;
-  different_profile.SetInfo(AutoFillType(NAME_FIRST), ASCIIToUTF16("joe"));
-  for (i = 0; i < count; i++)
-    ASSERT_NE(observer_.profiles_[i], different_profile);
+  // Observer should not have profiles.
+  ASSERT_EQ(0UL, observer_.profiles_.size());
 }
 
-TEST_F(AutoFillDialogControllerTest, NoEditsGiveBackOriginalCreditCard) {
+TEST_F(AutoFillDialogControllerTest, NoEditsDoNotChangeObserverCreditCards) {
   CreditCard credit_card(ASCIIToUTF16("myCC"), 345);
   credit_cards().push_back(&credit_card);
   LoadDialog();
-  [controller_ save:nil];
+  [controller_ closeDialog];
 
-  // Should hit our observer.
-  ASSERT_TRUE(observer_.hit_);
+  // Should not hit our observer.
+  ASSERT_FALSE(observer_.hit_);
 
-  // Sizes should match.
-  ASSERT_EQ(observer_.credit_cards_.size(), credit_cards().size());
-
-  // Contents should match.  With the exception of the |unique_id|.
-  size_t i = 0;
-  size_t count = credit_cards().size();
-  for (i = 0; i < count; i++) {
-    credit_cards()[i]->set_unique_id(observer_.credit_cards_[i].unique_id());
-    ASSERT_EQ(observer_.credit_cards_[i], *credit_cards()[i]);
-  }
-
-  // Contents should not match a different profile.
-  CreditCard different_credit_card(ASCIIToUTF16("different"), 0);
-  different_credit_card.SetInfo(
-    AutoFillType(CREDIT_CARD_NUMBER), ASCIIToUTF16("1234"));
-  for (i = 0; i < count; i++)
-    ASSERT_NE(observer_.credit_cards_[i], different_credit_card);
+  // Observer should not have credit cards.
+  ASSERT_EQ(0UL, observer_.credit_cards_.size());
 }
 
 TEST_F(AutoFillDialogControllerTest, AutoFillDataMutation) {
   AutoFillProfile profile(ASCIIToUTF16("Home"), 17);
   profile.SetInfo(AutoFillType(NAME_FIRST), ASCIIToUTF16("John"));
   profile.SetInfo(AutoFillType(NAME_MIDDLE), ASCIIToUTF16("C"));
   profile.SetInfo(AutoFillType(NAME_LAST), ASCIIToUTF16("Smith"));
   profile.SetInfo(AutoFillType(EMAIL_ADDRESS),
-      ASCIIToUTF16("john@chromium.org"));
+                  ASCIIToUTF16("john@chromium.org"));
   profile.SetInfo(AutoFillType(COMPANY_NAME), ASCIIToUTF16("Google Inc."));
   profile.SetInfo(AutoFillType(ADDRESS_HOME_LINE1),
                   ASCIIToUTF16("1122 Mountain View Road"));
   profile.SetInfo(AutoFillType(ADDRESS_HOME_LINE2), ASCIIToUTF16("Suite #1"));
   profile.SetInfo(AutoFillType(ADDRESS_HOME_CITY),
-      ASCIIToUTF16("Mountain View"));
+                  ASCIIToUTF16("Mountain View"));
   profile.SetInfo(AutoFillType(ADDRESS_HOME_STATE), ASCIIToUTF16("CA"));
   profile.SetInfo(AutoFillType(ADDRESS_HOME_ZIP), ASCIIToUTF16("94111"));
   profile.SetInfo(AutoFillType(ADDRESS_HOME_COUNTRY), ASCIIToUTF16("USA"));
-  profile.SetInfo(
-      AutoFillType(PHONE_HOME_WHOLE_NUMBER), ASCIIToUTF16("014155552258"));
-  profile.SetInfo(
-      AutoFillType(PHONE_FAX_WHOLE_NUMBER), ASCIIToUTF16("024087172258"));
+  profile.SetInfo(AutoFillType(PHONE_HOME_WHOLE_NUMBER),
+                  ASCIIToUTF16("014155552258"));
+  profile.SetInfo(AutoFillType(PHONE_FAX_WHOLE_NUMBER),
+                  ASCIIToUTF16("024087172258"));
   profiles().push_back(&profile);
 
   LoadDialog();
   [controller_ selectAddressAtIndex:0];
   [controller_ editSelection:nil];
 
   AutoFillAddressSheetController* sheet = [controller_ addressSheetController];
   ASSERT_TRUE(sheet != nil);
   AutoFillAddressModel* am = [sheet addressModel];
   EXPECT_TRUE([[am fullName] isEqualToString:@"John C Smith"]);
   EXPECT_TRUE([[am email] isEqualToString:@"john@chromium.org"]);
   EXPECT_TRUE([[am companyName] isEqualToString:@"Google Inc."]);
   EXPECT_TRUE([[am addressLine1] isEqualToString:@"1122 Mountain View Road"]);
   EXPECT_TRUE([[am addressLine2] isEqualToString:@"Suite #1"]);
   EXPECT_TRUE([[am addressCity] isEqualToString:@"Mountain View"]);
   EXPECT_TRUE([[am addressState] isEqualToString:@"CA"]);
   EXPECT_TRUE([[am addressZip] isEqualToString:@"94111"]);
   EXPECT_TRUE([[am phoneWholeNumber] isEqualToString:@"014155552258"]);
   EXPECT_TRUE([[am faxWholeNumber] isEqualToString:@"024087172258"]);
 
   [sheet save:nil];
-  [controller_ save:nil];
+  [controller_ closeDialog];
 
   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_NUMBER),
+                      ASCIIToUTF16("1234 5678 9101 1121"));
   credit_card.SetInfo(AutoFillType(CREDIT_CARD_EXP_MONTH), ASCIIToUTF16("01"));
-  credit_card.SetInfo(
-    AutoFillType(CREDIT_CARD_EXP_4_DIGIT_YEAR), ASCIIToUTF16("2012"));
+  credit_card.SetInfo(AutoFillType(CREDIT_CARD_EXP_4_DIGIT_YEAR),
+                      ASCIIToUTF16("2012"));
   credit_cards().push_back(&credit_card);
 
   LoadDialog();
   [controller_ selectCreditCardAtIndex:0];
   [controller_ editSelection:nil];
 
   AutoFillCreditCardSheetController* sheet =
       [controller_ creditCardSheetController];
   ASSERT_TRUE(sheet != nil);
   AutoFillCreditCardModel* cm = [sheet creditCardModel];
   EXPECT_TRUE([[cm nameOnCard] isEqualToString:@"DCH"]);
   EXPECT_TRUE([[cm creditCardNumber] isEqualToString:@"1234 5678 9101 1121"]);
   EXPECT_TRUE([[cm expirationMonth] isEqualToString:@"01"]);
   EXPECT_TRUE([[cm expirationYear] isEqualToString:@"2012"]);
 
   // Check that user-visible text is obfuscated.
   NSTextField* numberField = [sheet creditCardNumberField];
   ASSERT_TRUE(numberField != nil);
   EXPECT_TRUE([[numberField stringValue] isEqualToString:@"************1121"]);
 
   [sheet save:nil];
-  [controller_ save:nil];
+  [controller_ closeDialog];
 
   ASSERT_TRUE(observer_.hit_);
   ASSERT_TRUE(observer_.credit_cards_.size() == 1);
 
   // Don't compare unique ids.
   credit_cards()[0]->set_unique_id(observer_.credit_cards_[0].unique_id());
   ASSERT_EQ(observer_.credit_cards_[0], *credit_cards()[0]);
 }
 
 TEST_F(AutoFillDialogControllerTest, TwoProfiles) {
   AutoFillProfile profile1(ASCIIToUTF16("One"), 1);
   profile1.SetInfo(AutoFillType(NAME_FIRST), ASCIIToUTF16("Joe"));
   profiles().push_back(&profile1);
   AutoFillProfile profile2(ASCIIToUTF16("Two"), 2);
   profile2.SetInfo(AutoFillType(NAME_FIRST), ASCIIToUTF16("Bob"));
   profiles().push_back(&profile2);
   LoadDialog();
-  [controller_ save:nil];
+  [controller_ closeDialog];
 
-  // Should hit our observer.
-  ASSERT_TRUE(observer_.hit_);
+  // Should not hit our observer.
+  ASSERT_FALSE(observer_.hit_);
 
   // Sizes should match.  And should be 2.
-  ASSERT_EQ(observer_.profiles_.size(), profiles().size());
-  ASSERT_EQ(observer_.profiles_.size(), 2UL);
+  ASSERT_EQ([controller_ profiles].size(), profiles().size());
+  ASSERT_EQ([controller_ 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());
+    profiles()[i]->set_unique_id([controller_ profiles][i].unique_id());
 
     // Do not compare labels.  Label is a derived field.
-    observer_.profiles_[i].set_label(string16());
+    [controller_ profiles][i].set_label(string16());
     profiles()[i]->set_label(string16());
-    ASSERT_EQ(observer_.profiles_[i], *profiles()[i]);
+    ASSERT_EQ([controller_ 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"));
   credit_cards().push_back(&credit_card2);
   LoadDialog();
-  [controller_ save:nil];
+  [controller_ closeDialog];
 
-  // Should hit our observer.
-  ASSERT_TRUE(observer_.hit_);
+  // Should not hit our observer.
+  ASSERT_FALSE(observer_.hit_);
 
   // Sizes should match.  And should be 2.
-  ASSERT_EQ(observer_.credit_cards_.size(), credit_cards().size());
-  ASSERT_EQ(observer_.credit_cards_.size(), 2UL);
+  ASSERT_EQ([controller_ creditCards].size(), credit_cards().size());
+  ASSERT_EQ([controller_ creditCards].size(), 2UL);
 
   // Contents should match.  With the exception of the |unique_id|.
   for (size_t i = 0, count = credit_cards().size(); i < count; i++) {
-    credit_cards()[i]->set_unique_id(observer_.credit_cards_[i].unique_id());
-    ASSERT_EQ(observer_.credit_cards_[i], *credit_cards()[i]);
+    credit_cards()[i]->set_unique_id([controller_ creditCards][i].unique_id());
+    ASSERT_EQ([controller_ creditCards][i], *credit_cards()[i]);
   }
 }
 
 TEST_F(AutoFillDialogControllerTest, AddNewProfile) {
   AutoFillProfile profile(ASCIIToUTF16("One"), 1);
   profile.SetInfo(AutoFillType(NAME_FIRST), ASCIIToUTF16("Joe"));
   profiles().push_back(&profile);
   LoadDialog();
   [controller_ addNewAddress:nil];
   AutoFillAddressSheetController* sheet = [controller_ addressSheetController];
   ASSERT_TRUE(sheet != nil);
   AutoFillAddressModel* model = [sheet addressModel];
   ASSERT_TRUE(model != nil);
   [model setFullName:@"Don"];
   [sheet save:nil];
-  [controller_ save:nil];
+  [controller_ closeDialog];
 
   // Should hit our observer.
   ASSERT_TRUE(observer_.hit_);
 
   // Sizes should be different.  New size should be 2.
   ASSERT_NE(observer_.profiles_.size(), profiles().size());
   ASSERT_EQ(observer_.profiles_.size(), 2UL);
 
   // New address should match.  Don't compare labels.
   AutoFillProfile new_profile;
   new_profile.SetInfo(AutoFillType(NAME_FULL), ASCIIToUTF16("Don"));
   observer_.profiles_[1].set_label(string16());
   ASSERT_EQ(observer_.profiles_[1], new_profile);
 }
 
 TEST_F(AutoFillDialogControllerTest, AddNewCreditCard) {
   CreditCard credit_card(ASCIIToUTF16("Visa"), 1);
   credit_card.SetInfo(AutoFillType(CREDIT_CARD_NAME), ASCIIToUTF16("Joe"));
   credit_cards().push_back(&credit_card);
   LoadDialog();
   [controller_ addNewCreditCard:nil];
   AutoFillCreditCardSheetController* sheet =
       [controller_ creditCardSheetController];
   ASSERT_TRUE(sheet != nil);
   AutoFillCreditCardModel* model = [sheet creditCardModel];
   ASSERT_TRUE(model != nil);
   [model setNameOnCard:@"Don"];
   [sheet save:nil];
-  [controller_ save:nil];
+  [controller_ closeDialog];
 
   // Should hit our observer.
   ASSERT_TRUE(observer_.hit_);
 
   // Sizes should be different.  New size should be 2.
   ASSERT_NE(observer_.credit_cards_.size(), credit_cards().size());
   ASSERT_EQ(observer_.credit_cards_.size(), 2UL);
 
   // New credit card should match.  Don't compare labels.
   CreditCard new_credit_card;
   new_credit_card.SetInfo(AutoFillType(CREDIT_CARD_NAME), ASCIIToUTF16("Don"));
   observer_.credit_cards_[1].set_label(string16());
   ASSERT_EQ(observer_.credit_cards_[1], new_credit_card);
 }
 
 TEST_F(AutoFillDialogControllerTest, AddNewEmptyProfile) {
   AutoFillProfile profile(string16(), 1);
   profile.SetInfo(AutoFillType(NAME_FIRST), ASCIIToUTF16("Joe"));
   profiles().push_back(&profile);
   LoadDialog();
   [controller_ addNewAddress:nil];
   AutoFillAddressSheetController* sheet = [controller_ addressSheetController];
   ASSERT_TRUE(sheet != nil);
   [sheet save:nil];
-  [controller_ save:nil];
+  [controller_ closeDialog];
 
-  // Should hit our observer.
-  ASSERT_TRUE(observer_.hit_);
+  // Should not hit our observer.
+  ASSERT_FALSE(observer_.hit_);
 
-  // Sizes should be same.  Empty profile should not be saved.
-  ASSERT_EQ(observer_.profiles_.size(), profiles().size());
-  ASSERT_EQ(observer_.profiles_.size(), 1UL);
-
-  // Profile should match original.
-  observer_.profiles_[0].set_label(string16());
-  ASSERT_EQ(observer_.profiles_[0], profile);
+  // Empty profile should not be saved.
+  ASSERT_EQ(0UL, observer_.profiles_.size());
 }
 
 TEST_F(AutoFillDialogControllerTest, AddNewEmptyCreditCard) {
   CreditCard credit_card(string16(), 1);
   credit_card.SetInfo(AutoFillType(CREDIT_CARD_NAME), ASCIIToUTF16("Joe"));
   credit_cards().push_back(&credit_card);
   LoadDialog();
   [controller_ addNewCreditCard:nil];
   AutoFillCreditCardSheetController* sheet =
       [controller_ creditCardSheetController];
   ASSERT_TRUE(sheet != nil);
   [sheet save:nil];
-  [controller_ save:nil];
+  [controller_ closeDialog];
 
   // Should hit our observer.
-  ASSERT_TRUE(observer_.hit_);
+  ASSERT_FALSE(observer_.hit_);
 
-  // Sizes should be same.  Empty credit card should not be saved.
-  ASSERT_EQ(observer_.credit_cards_.size(), credit_cards().size());
-  ASSERT_EQ(observer_.credit_cards_.size(), 1UL);
-
-  // Credit card should match original.
-  observer_.credit_cards_[0].set_label(string16());
-  ASSERT_EQ(observer_.credit_cards_[0], credit_card);
+  // Empty credit card should not be saved.
+  ASSERT_EQ(0UL, observer_.credit_cards_.size());
 }
 
 TEST_F(AutoFillDialogControllerTest, DeleteProfile) {
   AutoFillProfile profile(ASCIIToUTF16("One"), 1);
   profile.SetInfo(AutoFillType(NAME_FIRST), ASCIIToUTF16("Joe"));
   profiles().push_back(&profile);
   LoadDialog();
   [controller_ selectAddressAtIndex:0];
   [controller_ deleteSelection:nil];
-  [controller_ save:nil];
+  [controller_ closeDialog];
 
   // Should hit our observer.
   ASSERT_TRUE(observer_.hit_);
 
   // Sizes should be different.  New size should be 0.
   ASSERT_NE(observer_.profiles_.size(), profiles().size());
   ASSERT_EQ(observer_.profiles_.size(), 0UL);
 }
 
 TEST_F(AutoFillDialogControllerTest, DeleteCreditCard) {
   CreditCard credit_card(ASCIIToUTF16("Visa"), 1);
   credit_card.SetInfo(AutoFillType(CREDIT_CARD_NAME), ASCIIToUTF16("Joe"));
   credit_cards().push_back(&credit_card);
   LoadDialog();
   [controller_ selectCreditCardAtIndex:0];
   [controller_ deleteSelection:nil];
-  [controller_ save:nil];
+  [controller_ closeDialog];
 
   // Should hit our observer.
   ASSERT_TRUE(observer_.hit_);
 
   // Sizes should be different.  New size should be 0.
   ASSERT_NE(observer_.credit_cards_.size(), credit_cards().size());
   ASSERT_EQ(observer_.credit_cards_.size(), 0UL);
 }
 
 TEST_F(AutoFillDialogControllerTest, TwoProfilesDeleteOne) {
   AutoFillProfile profile(ASCIIToUTF16("One"), 1);
   profile.SetInfo(AutoFillType(NAME_FIRST), ASCIIToUTF16("Joe"));
   profiles().push_back(&profile);
   AutoFillProfile profile2(ASCIIToUTF16("Two"), 2);
   profile2.SetInfo(AutoFillType(NAME_FIRST), ASCIIToUTF16("Bob"));
   profiles().push_back(&profile2);
   LoadDialog();
   [controller_ selectAddressAtIndex:1];
   [controller_ deleteSelection:nil];
-  [controller_ save:nil];
+  [controller_ closeDialog];
 
   // Should hit our observer.
   ASSERT_TRUE(observer_.hit_);
 
   // Sizes should be different.  New size should be 1.
   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);
   LoadDialog();
   [controller_ selectCreditCardAtIndex:1];
   [controller_ deleteSelection:nil];
-  [controller_ save:nil];
+  [controller_ closeDialog];
 
   // Should hit our observer.
   ASSERT_TRUE(observer_.hit_);
 
   // Sizes should be different.  New size should be 1.
   ASSERT_NE(observer_.credit_cards_.size(), credit_cards().size());
   ASSERT_EQ(observer_.credit_cards_.size(), 1UL);
 
   // First credit card should match.
   credit_cards()[0]->set_unique_id(observer_.credit_cards_[0].unique_id());
@@ skipping 15 matching lines @@
   credit_card2.SetInfo(AutoFillType(CREDIT_CARD_NAME), ASCIIToUTF16("Bob"));
   credit_cards().push_back(&credit_card2);
 
   LoadDialog();
   [controller_ selectAddressAtIndex:1];
   [controller_ addSelectedCreditCardAtIndex:0];
   ASSERT_FALSE([controller_ editButtonEnabled]);
   [controller_ deleteSelection:nil];
   [controller_ selectAddressAtIndex:0];
   ASSERT_TRUE([controller_ editButtonEnabled]);
-  [controller_ save:nil];
+  [controller_ closeDialog];
 
   // Should hit our observer.
   ASSERT_TRUE(observer_.hit_);
 
   // Sizes should be different.  New size should be 1.
   ASSERT_NE(observer_.profiles_.size(), profiles().size());
   ASSERT_EQ(observer_.profiles_.size(), 1UL);
 
   // Sizes should be different.  New size should be 1.
   ASSERT_NE(observer_.credit_cards_.size(), credit_cards().size());
   ASSERT_EQ(observer_.credit_cards_.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);
 
   // Second credit card should match.
   credit_cards()[0]->set_unique_id(observer_.credit_cards_[0].unique_id());
   ASSERT_EQ(observer_.credit_cards_[0], credit_card2);
 }
 
 // Auxilliary profiles are enabled by default.
 TEST_F(AutoFillDialogControllerTest, AuxiliaryProfilesTrue) {
   LoadDialog();
-  [controller_ save:nil];
+  [controller_ closeDialog];
 
-  // Should hit our observer.
-  ASSERT_TRUE(observer_.hit_);
+  // Should not hit our observer.
+  ASSERT_FALSE(observer_.hit_);
 
   // Auxiliary profiles setting should be unchanged.
   ASSERT_TRUE(helper_.profile()->GetPrefs()->GetBoolean(
       prefs::kAutoFillAuxiliaryProfilesEnabled));
 }
 
 TEST_F(AutoFillDialogControllerTest, AuxiliaryProfilesFalse) {
   helper_.profile()->GetPrefs()->SetBoolean(
       prefs::kAutoFillAuxiliaryProfilesEnabled, false);
   LoadDialog();
-  [controller_ save:nil];
+  [controller_ closeDialog];
 
-  // Should hit our observer.
-  ASSERT_TRUE(observer_.hit_);
+  // Should not hit our observer.
+  ASSERT_FALSE(observer_.hit_);
 
   // Auxiliary profiles setting should be unchanged.
   ASSERT_FALSE(helper_.profile()->GetPrefs()->GetBoolean(
       prefs::kAutoFillAuxiliaryProfilesEnabled));
 }
 
 TEST_F(AutoFillDialogControllerTest, AuxiliaryProfilesChanged) {
   helper_.profile()->GetPrefs()->SetBoolean(
       prefs::kAutoFillAuxiliaryProfilesEnabled, false);
   LoadDialog();
   [controller_ setAuxiliaryEnabled:YES];
-  [controller_ save:nil];
+  [controller_ closeDialog];
 
-  // Should hit our observer.
-  ASSERT_TRUE(observer_.hit_);
+  // Should not hit our observer.
+  ASSERT_FALSE(observer_.hit_);
 
   // Auxiliary profiles setting should be unchanged.
   ASSERT_TRUE(helper_.profile()->GetPrefs()->GetBoolean(
       prefs::kAutoFillAuxiliaryProfilesEnabled));
 }
 
 TEST_F(AutoFillDialogControllerTest, WaitForDataToLoad) {
   AutoFillProfile profile(ASCIIToUTF16("Home"), 0);
   profiles().push_back(&profile);
   CreditCard credit_card(ASCIIToUTF16("Visa"), 0);
   credit_cards().push_back(&credit_card);
   helper_.test_profile_->test_manager_->test_data_is_loaded_ = false;
   LoadDialog();
-  [controller_ save:nil];
+  [controller_ closeDialog];
 
-  // Should hit our observer.
-  ASSERT_TRUE(observer_.hit_);
+  // Should not hit our observer.
+  ASSERT_FALSE(observer_.hit_);
 
   // Sizes should match.
-  ASSERT_EQ(observer_.profiles_.size(), profiles().size());
-  ASSERT_EQ(observer_.credit_cards_.size(), credit_cards().size());
+  ASSERT_EQ([controller_ profiles].size(), profiles().size());
+  ASSERT_EQ([controller_ creditCards].size(), credit_cards().size());
 
   // Contents should match.
   size_t i = 0;
   size_t count = profiles().size();
   for (i = 0; i < count; i++) {
     // Do not compare labels.  Label is a derived field.
-    observer_.profiles_[i].set_label(string16());
+    [controller_ profiles][i].set_label(string16());
     profiles()[i]->set_label(string16());
-    ASSERT_EQ(observer_.profiles_[i], *profiles()[i]);
+    ASSERT_EQ([controller_ profiles][i], *profiles()[i]);
   }
   count = credit_cards().size();
   for (i = 0; i < count; i++) {
-    ASSERT_EQ(observer_.credit_cards_[i], *credit_cards()[i]);
+    ASSERT_EQ([controller_ creditCards][i], *credit_cards()[i]);
   }
 }
 
-TEST_F(AutoFillDialogControllerTest, ImportedParameters) {
-  AutoFillProfile profile(ASCIIToUTF16("Home"), 0);
-  imported_profile_ = &profile;
-  CreditCard credit_card(ASCIIToUTF16("Mastercard"), 0);
-  imported_credit_card_ = &credit_card;
-
-  // Note: when the |imported_*| parameters are supplied the dialog should
-  // ignore any profile and credit card information in the
-  // |PersonalDataManager|.
-  AutoFillProfile profile_ignored(ASCIIToUTF16("Work"), 0);
-  profiles().push_back(&profile_ignored);
-  CreditCard credit_card_ignored(ASCIIToUTF16("Visa"), 0);
-  credit_cards().push_back(&credit_card_ignored);
-
-  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];
+  [controller_ closeDialog];
 
-  // Should hit our observer.
-  ASSERT_TRUE(observer_.hit_);
+  // Should not hit our observer.
+  ASSERT_FALSE(observer_.hit_);
 
   // AutoFill enabled setting should be unchanged.
   ASSERT_TRUE(helper_.profile()->GetPrefs()->GetBoolean(
       prefs::kAutoFillEnabled));
 }
 
 TEST_F(AutoFillDialogControllerTest, AutoFillEnabledFalse) {
   helper_.profile()->GetPrefs()->SetBoolean(prefs::kAutoFillEnabled, false);
   LoadDialog();
-  [controller_ save:nil];
+  [controller_ closeDialog];
 
-  // Should hit our observer.
-  ASSERT_TRUE(observer_.hit_);
+  // Should not hit our observer.
+  ASSERT_FALSE(observer_.hit_);
 
   // AutoFill enabled setting should be unchanged.
   ASSERT_FALSE(helper_.profile()->GetPrefs()->GetBoolean(
       prefs::kAutoFillEnabled));
 }
 
 TEST_F(AutoFillDialogControllerTest, AutoFillEnabledChanged) {
   helper_.profile()->GetPrefs()->SetBoolean(
       prefs::kAutoFillAuxiliaryProfilesEnabled, false);
   LoadDialog();
   [controller_ setAutoFillEnabled:YES];
-  [controller_ save:nil];
+  [controller_ closeDialog];
 
-  // Should hit our observer.
-  ASSERT_TRUE(observer_.hit_);
+  // Should not hit our observer.
+  ASSERT_FALSE(observer_.hit_);
 
   // Auxiliary profiles setting should be unchanged.
   ASSERT_TRUE(helper_.profile()->GetPrefs()->GetBoolean(
       prefs::kAutoFillEnabled));
 }
 
 TEST_F(AutoFillDialogControllerTest, PolicyRefresh) {
   LoadDialog();
   ASSERT_FALSE([controller_ autoFillManaged]);
 
   // Disable AutoFill through configuration policy.
   helper_.profile()->GetTestingPrefService()->SetManagedPref(
       prefs::kAutoFillEnabled, Value::CreateBooleanValue(false));
   ASSERT_TRUE([controller_ autoFillManaged]);
   ASSERT_FALSE([controller_ autoFillEnabled]);
 
   // Enabling through policy should switch to enabled but not editable.
   helper_.profile()->GetTestingPrefService()->SetManagedPref(
       prefs::kAutoFillEnabled, Value::CreateBooleanValue(true));
   ASSERT_TRUE([controller_ autoFillManaged]);
   ASSERT_TRUE([controller_ autoFillEnabled]);
 
-  [controller_ cancel:nil];
+  [controller_ closeDialog];
 }
 
 TEST_F(AutoFillDialogControllerTest, PolicyDisabledAndSave) {
   // Disable AutoFill through configuration policy.
   helper_.profile()->GetTestingPrefService()->SetManagedPref(
       prefs::kAutoFillEnabled, Value::CreateBooleanValue(false));
   helper_.profile()->GetPrefs()->SetBoolean(
       prefs::kAutoFillAuxiliaryProfilesEnabled, false);
   LoadDialog();
 
   // Save should be disabled.
   ASSERT_TRUE([controller_ autoFillManagedAndDisabled]);
 
   [controller_ setAuxiliaryEnabled:YES];
-  [controller_ save:nil];
+  [controller_ closeDialog];
 
   // Observer should not have been called.
   ASSERT_FALSE(observer_.hit_);
 
   // Auxiliary profiles setting should be unchanged.
   ASSERT_FALSE(helper_.profile()->GetPrefs()->GetBoolean(
       prefs::kAutoFillAuxiliaryProfilesEnabled));
 }
 
 TEST_F(AutoFillDialogControllerTest, PolicyEnabledAndSave) {
   // Enable AutoFill through configuration policy.
   helper_.profile()->GetTestingPrefService()->SetManagedPref(
       prefs::kAutoFillEnabled, Value::CreateBooleanValue(true));
   helper_.profile()->GetPrefs()->SetBoolean(
       prefs::kAutoFillAuxiliaryProfilesEnabled, false);
   LoadDialog();
 
   // Save should be enabled.
   ASSERT_FALSE([controller_ autoFillManagedAndDisabled]);
 
   [controller_ setAuxiliaryEnabled:YES];
-  [controller_ save:nil];
+  [controller_ closeDialog];
 
-  // Observer should have been notified.
-  ASSERT_TRUE(observer_.hit_);
+  // Observer should not have been notified.
+  ASSERT_FALSE(observer_.hit_);
 
   // Auxiliary profiles setting should have been saved.
   ASSERT_TRUE(helper_.profile()->GetPrefs()->GetBoolean(
       prefs::kAutoFillAuxiliaryProfilesEnabled));
 }
 
 }  // namespace