Revert 46424 - AutoFill profile shouldn't be saved when cancelled during init...

chrome/browser/autofill/autofill_dialog_controller_mac_unittest.mm

Index: chrome/browser/autofill/autofill_dialog_controller_mac_unittest.mm
===================================================================
--- chrome/browser/autofill/autofill_dialog_controller_mac_unittest.mm	(revision 46425)
+++ chrome/browser/autofill/autofill_dialog_controller_mac_unittest.mm	(working copy)
@@ -8,7 +8,6 @@
 #import "chrome/browser/autofill/autofill_credit_card_view_controller_mac.h"
 #import "chrome/browser/autofill/autofill_dialog_controller_mac.h"
 #include "chrome/browser/autofill/autofill_profile.h"
-#include "chrome/browser/autofill/personal_data_manager.h"
 #include "chrome/browser/cocoa/browser_test_helper.h"
 #import "chrome/browser/cocoa/cocoa_test_helper.h"
 #include "chrome/browser/pref_service.h"
@@ -17,98 +16,11 @@
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
-
-// Simulated delay (in milliseconds) for web data loading.
-const float kWebDataLoadDelayMilliseconds = 10.0;
-
-// Mock PersonalDataManager that gives back canned profiles and credit cards
-// as well as simulating delayed loading of web data using the
-// |PersonalDataManager::Observer| interface.
-class PersonalDataManagerMock : public PersonalDataManager {
+class AutoFillDialogObserverTester : public AutoFillDialogObserver {
  public:
-  PersonalDataManagerMock()
-      : observer_(NULL),
-        test_data_is_loaded_(true) {}
-  virtual ~PersonalDataManagerMock() {}
-
-  virtual const std::vector<AutoFillProfile*>& web_profiles() {
-    return test_profiles_;
-  }
-  virtual const std::vector<CreditCard*>& credit_cards() {
-    return test_credit_cards_;
-  }
-  virtual bool IsDataLoaded() const { return test_data_is_loaded_; }
-  virtual void SetObserver(PersonalDataManager::Observer* observer) {
-    DCHECK(observer);
-    observer_ = observer;
-
-    // This delay allows the UI loop to run and display intermediate results
-    // while the data is loading.  When notified that the data is available the
-    // UI updates with the new data.  10ms is a nice short amount of time to
-    // let the UI thread update but does not slow down the tests too much.
-    MessageLoop::current()->PostDelayedTask(
-        FROM_HERE,
-        new MessageLoop::QuitTask,
-        kWebDataLoadDelayMilliseconds);
-    MessageLoop::current()->Run();
-    observer_->OnPersonalDataLoaded();
-  }
-  virtual void RemoveObserver(PersonalDataManager::Observer* observer) {
-    observer_ = NULL;
-  }
-
-  std::vector<AutoFillProfile*> test_profiles_;
-  std::vector<CreditCard*> test_credit_cards_;
-  PersonalDataManager::Observer* observer_;
-  bool test_data_is_loaded_;
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(PersonalDataManagerMock);
-};
-
-// Mock profile that gives back our own mock |PersonalDataManager|.
-class ProfileMock : public TestingProfile {
- public:
-  ProfileMock() {
-    test_manager_.reset(new PersonalDataManagerMock);
-  }
-  virtual ~ProfileMock() {}
-
-  virtual PersonalDataManager* GetPersonalDataManager() {
-    return test_manager_.get();
-  }
-
-  scoped_ptr<PersonalDataManagerMock> test_manager_;
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(ProfileMock);
-};
-
-// Mock browser that gives back our own |BrowserMock| instance as the profile.
-class BrowserMock : public BrowserTestHelper {
- public:
-  BrowserMock() {
-    test_profile_.reset(new ProfileMock);
-  }
-  virtual ~BrowserMock() {}
-
-  // Override of |BrowserTestHelper::profile()|.
-  virtual TestingProfile* profile() const {
-    return test_profile_.get();
-  }
-
-  scoped_ptr<ProfileMock> test_profile_;
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(BrowserMock);
-};
-
-// Mock observer for the AutoFill settings dialog.
-class AutoFillDialogObserverMock : public AutoFillDialogObserver {
- public:
-  AutoFillDialogObserverMock()
+  AutoFillDialogObserverTester()
     : hit_(false) {}
-  virtual ~AutoFillDialogObserverMock() {}
+  virtual ~AutoFillDialogObserverTester() {}
 
   virtual void OnAutoFillDialogApply(
     std::vector<AutoFillProfile>* profiles,
@@ -131,42 +43,28 @@
   std::vector<CreditCard> credit_cards_;
 
  private:
-  DISALLOW_COPY_AND_ASSIGN(AutoFillDialogObserverMock);
+  DISALLOW_COPY_AND_ASSIGN(AutoFillDialogObserverTester);
 };
 
-// Test fixture for setting up and tearing down our dialog controller under
-// test.  Also provides helper methods to access the source profiles and
-// credit card information stored in mock |PersonalDataManager|.
 class AutoFillDialogControllerTest : public CocoaTest {
  public:
-  AutoFillDialogControllerTest()
-      : controller_(nil),
-        imported_profile_(NULL),
-        imported_credit_card_(NULL) {
-  }
+  AutoFillDialogControllerTest() {}
 
   void LoadDialog() {
     controller_ = [AutoFillDialogController
         controllerWithObserver:&observer_
-                       profile:helper_.profile()
-               importedProfile:imported_profile_
-            importedCreditCard:imported_credit_card_];
+              autoFillProfiles:profiles_
+                   creditCards:credit_cards_
+                       profile:helper_.profile()];
     [controller_ window];
   }
 
-  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_;
-  }
+  BrowserTestHelper helper_;
+  AutoFillDialogObserverTester observer_;
+  AutoFillDialogController* controller_;    // weak reference
+  std::vector<AutoFillProfile*> profiles_;  // weak references within vector
+  std::vector<CreditCard*> credit_cards_;   // weak references within vector
 
-  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);
 };
@@ -185,7 +83,7 @@
 
 TEST_F(AutoFillDialogControllerTest, NoEditsGiveBackOriginalProfile) {
   AutoFillProfile profile;
-  profiles().push_back(&profile);
+  profiles_.push_back(&profile);
   LoadDialog();
   [controller_ save:nil];
 
@@ -193,13 +91,13 @@
   ASSERT_TRUE(observer_.hit_);
 
   // Sizes should match.
-  ASSERT_EQ(observer_.profiles_.size(), profiles().size());
+  ASSERT_EQ(observer_.profiles_.size(), profiles_.size());
 
   // Contents should match.
   size_t i = 0;
-  size_t count = profiles().size();
+  size_t count = profiles_.size();
   for (i = 0; i < count; i++)
-    ASSERT_EQ(observer_.profiles_[i], *profiles()[i]);
+    ASSERT_EQ(observer_.profiles_[i], *profiles_[i]);
 
   // Contents should not match a different profile.
   AutoFillProfile different_profile;
@@ -211,7 +109,7 @@
 
 TEST_F(AutoFillDialogControllerTest, NoEditsGiveBackOriginalCreditCard) {
   CreditCard credit_card(ASCIIToUTF16("myCC"), 345);
-  credit_cards().push_back(&credit_card);
+  credit_cards_.push_back(&credit_card);
   LoadDialog();
   [controller_ save:nil];
 
@@ -219,14 +117,14 @@
   ASSERT_TRUE(observer_.hit_);
 
   // Sizes should match.
-  ASSERT_EQ(observer_.credit_cards_.size(), credit_cards().size());
+  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();
+  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]);
+    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.
@@ -255,7 +153,7 @@
   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"));
-  profiles().push_back(&profile);
+  profiles_.push_back(&profile);
 
   LoadDialog();
 
@@ -280,8 +178,8 @@
   ASSERT_TRUE(observer_.hit_);
   ASSERT_TRUE(observer_.profiles_.size() == 1);
 
-  profiles()[0]->set_unique_id(observer_.profiles_[0].unique_id());
-  ASSERT_EQ(observer_.profiles_[0], *profiles()[0]);
+  profiles_[0]->set_unique_id(observer_.profiles_[0].unique_id());
+  ASSERT_EQ(observer_.profiles_[0], *profiles_[0]);
 }
 
 TEST_F(AutoFillDialogControllerTest, CreditCardDataMutation) {
@@ -294,7 +192,7 @@
     AutoFillType(CREDIT_CARD_EXP_4_DIGIT_YEAR), ASCIIToUTF16("2012"));
   credit_card.SetInfo(
     AutoFillType(CREDIT_CARD_VERIFICATION_CODE), ASCIIToUTF16("222"));
-  credit_cards().push_back(&credit_card);
+  credit_cards_.push_back(&credit_card);
 
   LoadDialog();
 
@@ -312,17 +210,17 @@
   ASSERT_TRUE(observer_.hit_);
   ASSERT_TRUE(observer_.credit_cards_.size() == 1);
 
-  credit_cards()[0]->set_unique_id(observer_.credit_cards_[0].unique_id());
-  ASSERT_EQ(observer_.credit_cards_[0], *credit_cards()[0]);
+  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);
+  profiles_.push_back(&profile1);
   AutoFillProfile profile2(ASCIIToUTF16("Two"), 2);
   profile2.SetInfo(AutoFillType(NAME_FIRST), ASCIIToUTF16("Bob"));
-  profiles().push_back(&profile2);
+  profiles_.push_back(&profile2);
   LoadDialog();
   [controller_ save:nil];
 
@@ -330,23 +228,23 @@
   ASSERT_TRUE(observer_.hit_);
 
   // Sizes should match.  And should be 2.
-  ASSERT_EQ(observer_.profiles_.size(), profiles().size());
+  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());
-    ASSERT_EQ(observer_.profiles_[i], *profiles()[i]);
+  for (size_t i = 0, count = profiles_.size(); i < count; i++) {
+    profiles_[i]->set_unique_id(observer_.profiles_[i].unique_id());
+    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);
+  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);
+  credit_cards_.push_back(&credit_card2);
   LoadDialog();
   [controller_ save:nil];
 
@@ -354,20 +252,20 @@
   ASSERT_TRUE(observer_.hit_);
 
   // Sizes should match.  And should be 2.
-  ASSERT_EQ(observer_.credit_cards_.size(), credit_cards().size());
+  ASSERT_EQ(observer_.credit_cards_.size(), credit_cards_.size());
   ASSERT_EQ(observer_.credit_cards_.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]);
+  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]);
   }
 }
 
 TEST_F(AutoFillDialogControllerTest, AddNewProfile) {
   AutoFillProfile profile(ASCIIToUTF16("One"), 1);
   profile.SetInfo(AutoFillType(NAME_FIRST), ASCIIToUTF16("Joe"));
-  profiles().push_back(&profile);
+  profiles_.push_back(&profile);
   LoadDialog();
   [controller_ addNewAddress:nil];
   [controller_ save:nil];
@@ -376,7 +274,7 @@
   ASSERT_TRUE(observer_.hit_);
 
   // Sizes should match be different.  New size should be 2.
-  ASSERT_NE(observer_.profiles_.size(), profiles().size());
+  ASSERT_NE(observer_.profiles_.size(), profiles_.size());
   ASSERT_EQ(observer_.profiles_.size(), 2UL);
 
   // New address should match.
@@ -387,7 +285,7 @@
 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);
+  credit_cards_.push_back(&credit_card);
   LoadDialog();
   [controller_ addNewCreditCard:nil];
   [controller_ save:nil];
@@ -396,7 +294,7 @@
   ASSERT_TRUE(observer_.hit_);
 
   // Sizes should match be different.  New size should be 2.
-  ASSERT_NE(observer_.credit_cards_.size(), credit_cards().size());
+  ASSERT_NE(observer_.credit_cards_.size(), credit_cards_.size());
   ASSERT_EQ(observer_.credit_cards_.size(), 2UL);
 
   // New address should match.
@@ -407,7 +305,7 @@
 TEST_F(AutoFillDialogControllerTest, DeleteProfile) {
   AutoFillProfile profile(ASCIIToUTF16("One"), 1);
   profile.SetInfo(AutoFillType(NAME_FIRST), ASCIIToUTF16("Joe"));
-  profiles().push_back(&profile);
+  profiles_.push_back(&profile);
   LoadDialog();
   EXPECT_EQ([[[controller_ addressFormViewControllers] lastObject]
               retainCount], 1UL);
@@ -419,14 +317,14 @@
   ASSERT_TRUE(observer_.hit_);
 
   // Sizes should match be different.  New size should be 0.
-  ASSERT_NE(observer_.profiles_.size(), profiles().size());
+  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);
+  credit_cards_.push_back(&credit_card);
   LoadDialog();
   EXPECT_EQ([[[controller_ creditCardFormViewControllers] lastObject]
               retainCount], 1UL);
@@ -438,17 +336,17 @@
   ASSERT_TRUE(observer_.hit_);
 
   // Sizes should match be different.  New size should be 0.
-  ASSERT_NE(observer_.credit_cards_.size(), credit_cards().size());
+  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);
+  profiles_.push_back(&profile);
   AutoFillProfile profile2(ASCIIToUTF16("Two"), 2);
   profile2.SetInfo(AutoFillType(NAME_FIRST), ASCIIToUTF16("Bob"));
-  profiles().push_back(&profile2);
+  profiles_.push_back(&profile2);
   LoadDialog();
   [controller_ deleteAddress:[[controller_ addressFormViewControllers]
       lastObject]];
@@ -458,21 +356,21 @@
   ASSERT_TRUE(observer_.hit_);
 
   // Sizes should match be different.  New size should be 0.
-  ASSERT_NE(observer_.profiles_.size(), profiles().size());
+  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());
+  profiles_[0]->set_unique_id(observer_.profiles_[0].unique_id());
   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);
+  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);
+  credit_cards_.push_back(&credit_card2);
   LoadDialog();
   [controller_ deleteCreditCard:[[controller_ creditCardFormViewControllers]
       lastObject]];
@@ -482,11 +380,11 @@
   ASSERT_TRUE(observer_.hit_);
 
   // Sizes should match be different.  New size should be 0.
-  ASSERT_NE(observer_.credit_cards_.size(), credit_cards().size());
+  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());
+  credit_cards_[0]->set_unique_id(observer_.credit_cards_[0].unique_id());
   ASSERT_EQ(observer_.credit_cards_[0], credit_card);
 }
 
@@ -535,16 +433,16 @@
   // Two profiles, two credit cards.
   AutoFillProfile profile(ASCIIToUTF16("One"), 1);
   profile.SetInfo(AutoFillType(NAME_FIRST), ASCIIToUTF16("Joe"));
-  profiles().push_back(&profile);
+  profiles_.push_back(&profile);
   AutoFillProfile profile2(ASCIIToUTF16("Two"), 2);
   profile2.SetInfo(AutoFillType(NAME_FIRST), ASCIIToUTF16("Bob"));
-  profiles().push_back(&profile2);
+  profiles_.push_back(&profile2);
   CreditCard credit_card(ASCIIToUTF16("Visa"), 1);
   credit_card.SetInfo(AutoFillType(CREDIT_CARD_NAME), ASCIIToUTF16("Joe"));
-  credit_cards().push_back(&credit_card);
+  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);
+  credit_cards_.push_back(&credit_card2);
 
   // Invalid defaults for each.
   helper_.profile()->GetPrefs()->SetString(
@@ -597,60 +495,4 @@
       GetString(prefs::kAutoFillDefaultCreditCard));
 }
 
-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];
-
-  // 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++)
-    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);
-  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());
-
-  // Contents should match.
-  ASSERT_EQ(observer_.profiles_[0], profile);
-  ASSERT_EQ(observer_.credit_cards_[0], credit_card);
-}
-
-}  // namespace