Remove stl_util's STLDeleteContainerPointers from autofill.

components/browser_sync/profile_sync_service_autofill_unittest.cc

 // Copyright 2012 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 <stddef.h>
 #include <stdint.h>
 
 #include <memory>
 #include <set>
 #include <string>
@@ skipping 134 matching lines @@
   MOCK_METHOD1(GetAllAutofillEntries,
                bool(std::vector<AutofillEntry>* entries));  // NOLINT
   MOCK_METHOD4(GetAutofillTimestamps,
                bool(const base::string16& name,  // NOLINT
                     const base::string16& value,
                     Time* date_created,
                     Time* date_last_used));
   MOCK_METHOD1(UpdateAutofillEntries,
                bool(const std::vector<AutofillEntry>&));  // NOLINT
   MOCK_METHOD1(GetAutofillProfiles,
-               bool(std::vector<AutofillProfile*>*));                 // NOLINT
+               bool(std::vector<std::unique_ptr<AutofillProfile>>*));  // NOLINT
   MOCK_METHOD1(UpdateAutofillProfile, bool(const AutofillProfile&));  // NOLINT
   MOCK_METHOD1(AddAutofillProfile, bool(const AutofillProfile&));     // NOLINT
   MOCK_METHOD1(RemoveAutofillProfile, bool(const std::string&));      // NOLINT
 };
 
 MATCHER_P(MatchProfiles, profile, "") {
   return (profile.Compare(arg) == 0);
 }
 
+ACTION_P(LoadAutofillProfiles, datafunc) {
+  std::vector<std::unique_ptr<AutofillProfile>> profiles =
+      std::move(datafunc());
+  arg0->swap(profiles);
+}
+
 class WebDatabaseFake : public WebDatabase {
  public:
   explicit WebDatabaseFake(AutofillTable* autofill_table) {
     AddTable(autofill_table);
   }
 };
 
 class MockAutofillBackend : public autofill::AutofillWebDataBackend {
  public:
   MockAutofillBackend(
@@ skipping 666 matching lines @@
   ASSERT_TRUE(create_root.success());
   std::vector<AutofillEntry> sync_entries;
   std::vector<AutofillProfile> sync_profiles;
   ASSERT_TRUE(GetAutofillEntriesFromSyncDB(&sync_entries, &sync_profiles));
   ASSERT_EQ(1U, entries.size());
   EXPECT_TRUE(entries[0] == sync_entries[0]);
   EXPECT_EQ(0U, sync_profiles.size());
 }
 
 TEST_F(ProfileSyncServiceAutofillTest, HasProfileEmptySync) {
-  std::vector<AutofillProfile*> profiles;
+  std::vector<std::unique_ptr<AutofillProfile>> profiles;
   std::vector<AutofillProfile> expected_profiles;
-  // Owned by GetAutofillProfiles caller.
-  AutofillProfile* profile0 = new AutofillProfile;
+  std::unique_ptr<AutofillProfile> profile0 =
+      base::MakeUnique<AutofillProfile>();
   autofill::test::SetProfileInfoWithGuid(
-      profile0, "54B3F9AA-335E-4F71-A27D-719C41564230", "Billing", "Mitchell",
-      "Morrison", "johnwayne@me.xyz", "Fox", "123 Zoo St.", "unit 5",
-      "Hollywood", "CA", "91601", "US", "12345678910");
-  profiles.push_back(profile0);
+      profile0.get(), "54B3F9AA-335E-4F71-A27D-719C41564230", "Billing",
+      "Mitchell", "Morrison", "johnwayne@me.xyz", "Fox", "123 Zoo St.",
+      "unit 5", "Hollywood", "CA", "91601", "US", "12345678910");
   expected_profiles.push_back(*profile0);
+  profiles.push_back(std::move(profile0));
+  auto profile_returner = [&profiles]() { return std::move(profiles); };
   EXPECT_CALL(autofill_table(), GetAutofillProfiles(_))
-      .WillOnce(DoAll(SetArgumentPointee<0>(profiles), Return(true)));
+      .WillOnce(DoAll(LoadAutofillProfiles(profile_returner), Return(true)));
   EXPECT_CALL(personal_data_manager(), Refresh());
   SetIdleChangeProcessorExpectations();
   CreateRootHelper create_root(this, AUTOFILL_PROFILE);
   StartSyncService(create_root.callback(), false, AUTOFILL_PROFILE);
   ASSERT_TRUE(create_root.success());
   std::vector<AutofillProfile> sync_profiles;
   ASSERT_TRUE(GetAutofillProfilesFromSyncDBUnderProfileNode(&sync_profiles));
   EXPECT_EQ(1U, sync_profiles.size());
   EXPECT_EQ(0, expected_profiles[0].Compare(sync_profiles[0]));
 }
@@ skipping 83 matching lines @@
   EXPECT_TRUE(merged_entry == new_sync_entries[0]);
 }
 
 TEST_F(ProfileSyncServiceAutofillTest, HasNativeHasSyncMergeProfile) {
   AutofillProfile sync_profile;
   autofill::test::SetProfileInfoWithGuid(
       &sync_profile, "23355099-1170-4B71-8ED4-144470CC9EBE", "Billing",
       "Mitchell", "Morrison", "johnwayne@me.xyz", "Fox", "123 Zoo St.",
       "unit 5", "Hollywood", "CA", "91601", "US", "12345678910");
 
-  AutofillProfile* native_profile = new AutofillProfile;
+  std::unique_ptr<AutofillProfile> native_profile =
+      base::MakeUnique<AutofillProfile>();
   autofill::test::SetProfileInfoWithGuid(
-      native_profile, "23355099-1170-4B71-8ED4-144470CC9EBE", "Billing",
+      native_profile.get(), "23355099-1170-4B71-8ED4-144470CC9EBE", "Billing",
       "Alicia", "Saenz", "joewayne@me.xyz", "Fox", "1212 Center.", "Bld. 5",
       "Orlando", "FL", "32801", "US", "19482937549");
 
-  std::vector<AutofillProfile*> native_profiles;
-  native_profiles.push_back(native_profile);
+  std::vector<std::unique_ptr<AutofillProfile>> native_profiles;
+  native_profiles.push_back(std::move(native_profile));
+  auto profile_returner = [&native_profiles]() {
+    return std::move(native_profiles);
+  };
   EXPECT_CALL(autofill_table(), GetAutofillProfiles(_))
-      .WillOnce(DoAll(SetArgumentPointee<0>(native_profiles), Return(true)));
+      .WillOnce(DoAll(LoadAutofillProfiles(profile_returner), Return(true)));
 
   std::vector<AutofillProfile> sync_profiles;
   sync_profiles.push_back(sync_profile);
   AddAutofillHelper<AutofillProfile> add_autofill(this, sync_profiles);
 
   EXPECT_CALL(autofill_table(),
               UpdateAutofillProfile(MatchProfiles(sync_profile)))
       .WillOnce(Return(true));
   EXPECT_CALL(personal_data_manager(), Refresh());
   StartSyncService(add_autofill.callback(), false, AUTOFILL_PROFILE);
@@ skipping 14 matching lines @@
     HasNativeHasSyncMergeSimilarProfileCombine_SyncHasMoreInfoAndMoreRecent) {
   // Create two almost identical profiles. The GUIDs are different and the
   // native profile has no value for company name.
   AutofillProfile sync_profile;
   autofill::test::SetProfileInfoWithGuid(
       &sync_profile, "23355099-1170-4B71-8ED4-144470CC9EBE", "Billing",
       "Mitchell", "Morrison", "johnwayne@me.xyz", "Fox", "123 Zoo St.",
       "unit 5", "Hollywood", "CA", "91601", "US", "12345678910");
   sync_profile.set_use_date(base::Time::FromTimeT(4321));
 
-  AutofillProfile* native_profile = new AutofillProfile;
+  std::unique_ptr<AutofillProfile> native_profile =
+      base::MakeUnique<AutofillProfile>();
   autofill::test::SetProfileInfoWithGuid(
-      native_profile, "23355099-1170-4B71-8ED4-144470CC9EBF", "Billing",
+      native_profile.get(), "23355099-1170-4B71-8ED4-144470CC9EBF", "Billing",
       "Mitchell", "Morrison", "johnwayne@me.xyz", "", "123 Zoo St.", "unit 5",
       "Hollywood", "CA", "91601", "US", "12345678910");
   native_profile->set_use_date(base::Time::FromTimeT(1234));
 
   AutofillProfile expected_profile(sync_profile);
   expected_profile.SetRawInfo(NAME_FULL,
                               ASCIIToUTF16("Billing Mitchell Morrison"));
   expected_profile.set_use_count(1);
 
-  std::vector<AutofillProfile*> native_profiles;
-  native_profiles.push_back(native_profile);
+  std::vector<std::unique_ptr<AutofillProfile>> native_profiles;
+  native_profiles.push_back(std::move(native_profile));
+  auto profile_returner = [&native_profiles]() {
+    return std::move(native_profiles);
+  };
   EXPECT_CALL(autofill_table(), GetAutofillProfiles(_))
-      .WillOnce(DoAll(SetArgumentPointee<0>(native_profiles), Return(true)));
+      .WillOnce(DoAll(LoadAutofillProfiles(profile_returner), Return(true)));
   EXPECT_CALL(autofill_table(),
               AddAutofillProfile(MatchProfiles(expected_profile)))
       .WillOnce(Return(true));
   EXPECT_CALL(autofill_table(),
               RemoveAutofillProfile("23355099-1170-4B71-8ED4-144470CC9EBF"))
       .WillOnce(Return(true));
   std::vector<AutofillProfile> sync_profiles;
   sync_profiles.push_back(sync_profile);
   AddAutofillHelper<AutofillProfile> add_autofill(this, sync_profiles);
 
@@ skipping 24 matching lines @@
        HasNativeHasSyncMergeSimilarProfileCombine_SyncHasMoreInfoAndOlder) {
   // Create two almost identical profiles. The GUIDs are different and the
   // native profile has no value for company name.
   AutofillProfile sync_profile;
   autofill::test::SetProfileInfoWithGuid(
       &sync_profile, "23355099-1170-4B71-8ED4-144470CC9EBE", "Billing",
       "Mitchell", "Morrison", "johnwayne@me.xyz", "Fox", "123 Zoo St.",
       "unit 5", "Hollywood", "CA", "91601", "US", "12345678910");
   sync_profile.set_use_date(base::Time::FromTimeT(1234));
 
-  AutofillProfile* native_profile = new AutofillProfile;
+  std::unique_ptr<AutofillProfile> native_profile =
+      base::MakeUnique<AutofillProfile>();
   autofill::test::SetProfileInfoWithGuid(
-      native_profile, "23355099-1170-4B71-8ED4-144470CC9EBF", "Billing",
+      native_profile.get(), "23355099-1170-4B71-8ED4-144470CC9EBF", "Billing",
       "Mitchell", "Morrison", "johnwayne@me.xyz", "", "123 Zoo St.", "unit 5",
       "Hollywood", "CA", "91601", "US", "12345678910");
   native_profile->set_use_date(base::Time::FromTimeT(4321));
 
   AutofillProfile expected_profile(sync_profile);
   expected_profile.SetRawInfo(NAME_FULL,
                               ASCIIToUTF16("Billing Mitchell Morrison"));
   expected_profile.set_use_count(1);
   expected_profile.set_use_date(native_profile->use_date());
 
-  std::vector<AutofillProfile*> native_profiles;
-  native_profiles.push_back(native_profile);
+  std::vector<std::unique_ptr<AutofillProfile>> native_profiles;
+  native_profiles.push_back(std::move(native_profile));
+  auto profile_returner = [&native_profiles]() {
+    return std::move(native_profiles);
+  };
   EXPECT_CALL(autofill_table(), GetAutofillProfiles(_))
-      .WillOnce(DoAll(SetArgumentPointee<0>(native_profiles), Return(true)));
+      .WillOnce(DoAll(LoadAutofillProfiles(profile_returner), Return(true)));
   EXPECT_CALL(autofill_table(),
               AddAutofillProfile(MatchProfiles(expected_profile)))
       .WillOnce(Return(true));
   EXPECT_CALL(autofill_table(),
               RemoveAutofillProfile("23355099-1170-4B71-8ED4-144470CC9EBF"))
       .WillOnce(Return(true));
   std::vector<AutofillProfile> sync_profiles;
   sync_profiles.push_back(sync_profile);
   AddAutofillHelper<AutofillProfile> add_autofill(this, sync_profiles);
 
@@ skipping 26 matching lines @@
        HasNativeHasSyncMergeSimilarProfileCombine_NativeHasMoreInfo) {
   // Create two almost identical profiles. The GUIDs are different and the
   // sync profile has no value for company name.
   AutofillProfile sync_profile;
   autofill::test::SetProfileInfoWithGuid(
       &sync_profile, "23355099-1170-4B71-8ED4-144470CC9EBE", "Billing",
       "Mitchell", "Morrison", "johnwayne@me.xyz", "", "123 Zoo St.", "unit 5",
       "Hollywood", "CA", "91601", "US", "12345678910");
   sync_profile.set_use_date(base::Time::FromTimeT(4321));
 
-  AutofillProfile* native_profile = new AutofillProfile;
+  std::unique_ptr<AutofillProfile> native_profile =
+      base::MakeUnique<AutofillProfile>();
   autofill::test::SetProfileInfoWithGuid(
-      native_profile, "23355099-1170-4B71-8ED4-144470CC9EBF", "Billing",
+      native_profile.get(), "23355099-1170-4B71-8ED4-144470CC9EBF", "Billing",
       "Mitchell", "Morrison", "johnwayne@me.xyz", "Fox", "123 Zoo St.",
       "unit 5", "Hollywood", "CA", "91601", "US", "12345678910");
   native_profile->set_use_date(base::Time::FromTimeT(1234));
 
   AutofillProfile expected_profile(*native_profile);
   expected_profile.SetRawInfo(NAME_FULL,
                               ASCIIToUTF16("Billing Mitchell Morrison"));
   expected_profile.set_use_date(sync_profile.use_date());
   expected_profile.set_use_count(1);
 
-  std::vector<AutofillProfile*> native_profiles;
-  native_profiles.push_back(native_profile);
+  std::vector<std::unique_ptr<AutofillProfile>> native_profiles;
+  native_profiles.push_back(std::move(native_profile));
+  auto profile_returner = [&native_profiles]() {
+    return std::move(native_profiles);
+  };
   EXPECT_CALL(autofill_table(), GetAutofillProfiles(_))
-      .WillOnce(DoAll(SetArgumentPointee<0>(native_profiles), Return(true)));
+      .WillOnce(DoAll(LoadAutofillProfiles(profile_returner), Return(true)));
   EXPECT_CALL(autofill_table(),
               AddAutofillProfile(MatchProfiles(expected_profile)))
       .WillOnce(Return(true));
   EXPECT_CALL(autofill_table(),
               RemoveAutofillProfile("23355099-1170-4B71-8ED4-144470CC9EBF"))
       .WillOnce(Return(true));
   std::vector<AutofillProfile> sync_profiles;
   sync_profiles.push_back(sync_profile);
   AddAutofillHelper<AutofillProfile> add_autofill(this, sync_profiles);
 
   EXPECT_CALL(personal_data_manager(), Refresh());
   // Adds all entries in |sync_profiles| to sync.
   StartSyncService(add_autofill.callback(), false, AUTOFILL_PROFILE);
   ASSERT_TRUE(add_autofill.success());
 
   std::vector<AutofillProfile> new_sync_profiles;
   ASSERT_TRUE(
       GetAutofillProfilesFromSyncDBUnderProfileNode(&new_sync_profiles));
   ASSERT_EQ(1U, new_sync_profiles.size());
   // Check that key fields are the same.
   EXPECT_TRUE(new_sync_profiles[0].IsSubsetOf(expected_profile, "en-US"));
-  // Make sure the addtional information of the native profile was saved into
+  // Make sure the additional information of the native profile was saved into
   // the sync profile.
   EXPECT_EQ(ASCIIToUTF16("Fox"),
             new_sync_profiles[0].GetRawInfo(ServerFieldType::COMPANY_NAME));
   // Check that the latest use date is saved.
   EXPECT_EQ(base::Time::FromTimeT(4321), new_sync_profiles[0].use_date());
   // Check that the use counts were added (default value is 1).
   EXPECT_EQ(1U, new_sync_profiles[0].use_count());
 }
 
 // Tests that a sync with a new native profile that differ only by name a new
 // sync profile results in keeping both profiles.
 TEST_F(ProfileSyncServiceAutofillTest, HasNativeHasSync_DifferentPrimaryInfo) {
   AutofillProfile sync_profile;
   autofill::test::SetProfileInfoWithGuid(
       &sync_profile, "23355099-1170-4B71-8ED4-144470CC9EBE", "Billing",
       "Mitchell", "Morrison", "johnwayne@me.xyz", "Fox", "123 Zoo St.",
       "unit 5", "Hollywood", "CA", "91601", "US", "12345678910");
   sync_profile.set_use_date(base::Time::FromTimeT(4321));
 
-  AutofillProfile* native_profile = new AutofillProfile;
+  std::unique_ptr<AutofillProfile> native_profile =
+      base::MakeUnique<AutofillProfile>();
   autofill::test::SetProfileInfoWithGuid(
-      native_profile, "23355099-1170-4B71-8ED4-144470CC9EBF", "Billing", "John",
-      "Smith", "johnwayne@me.xyz", "Fox", "123 Zoo St.", "unit 5", "Hollywood",
-      "CA", "91601", "US", "12345678910");
+      native_profile.get(), "23355099-1170-4B71-8ED4-144470CC9EBF", "Billing",
+      "John", "Smith", "johnwayne@me.xyz", "Fox", "123 Zoo St.", "unit 5",
+      "Hollywood", "CA", "91601", "US", "12345678910");
   native_profile->set_use_date(base::Time::FromTimeT(1234));
 
-  std::vector<AutofillProfile*> native_profiles;
-  native_profiles.push_back(native_profile);
+  std::vector<std::unique_ptr<AutofillProfile>> native_profiles;
+  native_profiles.push_back(std::move(native_profile));
+  auto profile_returner = [&native_profiles]() {
+    return std::move(native_profiles);
+  };
   EXPECT_CALL(autofill_table(), GetAutofillProfiles(_))
-      .WillOnce(DoAll(SetArgumentPointee<0>(native_profiles), Return(true)));
+      .WillOnce(DoAll(LoadAutofillProfiles(profile_returner), Return(true)));
   EXPECT_CALL(autofill_table(), AddAutofillProfile(MatchProfiles(sync_profile)))
       .WillOnce(Return(true));
   std::vector<AutofillProfile> sync_profiles;
   sync_profiles.push_back(sync_profile);
   AddAutofillHelper<AutofillProfile> add_autofill(this, sync_profiles);
 
   EXPECT_CALL(personal_data_manager(), Refresh());
   // Adds all entries in |sync_profiles| to sync.
   StartSyncService(add_autofill.callback(), false, AUTOFILL_PROFILE);
   ASSERT_TRUE(add_autofill.success());
@@ skipping 12 matching lines @@
   AutofillProfile sync_profile;
 
   autofill::test::SetProfileInfoWithGuid(
       &sync_profile, "23355099-1170-4B71-8ED4-144470CC9EBE", "Billing",
       "Mitchell", "Morrison", "johnwayne@me.xyz", "Fox", "123 Zoo St.",
       "unit 5", "Hollywood", "CA", "91601", "US", "12345678910");
   sync_profile.set_use_count(20);
   sync_profile.set_use_date(base::Time::FromTimeT(1234));
 
   std::string native_guid = "EDC609ED-7EEE-4F27-B00C-423242A9C44B";
-  AutofillProfile* native_profile = new AutofillProfile;
+  std::unique_ptr<AutofillProfile> native_profile =
+      base::MakeUnique<AutofillProfile>();
   autofill::test::SetProfileInfoWithGuid(
-      native_profile, native_guid.c_str(), "Billing", "Mitchell", "Morrison",
-      "johnwayne@me.xyz", "Fox", "123 Zoo St.", "unit 5", "Hollywood", "CA",
-      "91601", "US", "12345678910");
+      native_profile.get(), native_guid.c_str(), "Billing", "Mitchell",
+      "Morrison", "johnwayne@me.xyz", "Fox", "123 Zoo St.", "unit 5",
+      "Hollywood", "CA", "91601", "US", "12345678910");
   native_profile->set_use_count(5);
   native_profile->set_use_date(base::Time::FromTimeT(4321));
 
-  std::vector<AutofillProfile*> native_profiles;
-  native_profiles.push_back(native_profile);
+  std::vector<std::unique_ptr<AutofillProfile>> native_profiles;
+  native_profiles.push_back(std::move(native_profile));
+  auto profile_returner = [&native_profiles]() {
+    return std::move(native_profiles);
+  };
   EXPECT_CALL(autofill_table(), GetAutofillProfiles(_))
-      .WillOnce(DoAll(SetArgumentPointee<0>(native_profiles), Return(true)));
+      .WillOnce(DoAll(LoadAutofillProfiles(profile_returner), Return(true)));
 
   std::vector<AutofillProfile> sync_profiles;
   sync_profiles.push_back(sync_profile);
   AddAutofillHelper<AutofillProfile> add_autofill(this, sync_profiles);
 
   EXPECT_CALL(autofill_table(), AddAutofillProfile(_)).WillOnce(Return(true));
   EXPECT_CALL(autofill_table(), RemoveAutofillProfile(native_guid))
       .WillOnce(Return(true));
   EXPECT_CALL(personal_data_manager(), Refresh());
   StartSyncService(add_autofill.callback(), false, AUTOFILL_PROFILE);
@@ skipping 122 matching lines @@
       GetAutofillEntriesFromSyncDB(&new_sync_entries, &new_sync_profiles));
   ASSERT_EQ(0U, new_sync_entries.size());
 }
 
 TEST_F(ProfileSyncServiceAutofillTest, ProcessUserChangeRemoveProfile) {
   AutofillProfile sync_profile;
   autofill::test::SetProfileInfoWithGuid(
       &sync_profile, "3BA5FA1B-1EC4-4BB3-9B57-EC92BE3C1A09", "Josephine",
       "Alicia", "Saenz", "joewayne@me.xyz", "Fox", "1212 Center.", "Bld. 5",
       "Orlando", "FL", "32801", "US", "19482937549");
-  AutofillProfile* native_profile = new AutofillProfile;
+  std::unique_ptr<AutofillProfile> native_profile =
+      base::MakeUnique<AutofillProfile>();
   autofill::test::SetProfileInfoWithGuid(
-      native_profile, "3BA5FA1B-1EC4-4BB3-9B57-EC92BE3C1A09", "Josephine",
+      native_profile.get(), "3BA5FA1B-1EC4-4BB3-9B57-EC92BE3C1A09", "Josephine",
       "Alicia", "Saenz", "joewayne@me.xyz", "Fox", "1212 Center.", "Bld. 5",
       "Orlando", "FL", "32801", "US", "19482937549");
 
-  std::vector<AutofillProfile*> native_profiles;
-  native_profiles.push_back(native_profile);
+  std::vector<std::unique_ptr<AutofillProfile>> native_profiles;
+  native_profiles.push_back(std::move(native_profile));
+  auto profile_returner = [&native_profiles]() {
+    return std::move(native_profiles);
+  };
   EXPECT_CALL(autofill_table(), GetAutofillProfiles(_))
-      .WillOnce(DoAll(SetArgumentPointee<0>(native_profiles), Return(true)));
+      .WillOnce(DoAll(LoadAutofillProfiles(profile_returner), Return(true)));
 
   std::vector<AutofillProfile> sync_profiles;
   sync_profiles.push_back(sync_profile);
   AddAutofillHelper<AutofillProfile> add_autofill(this, sync_profiles);
   EXPECT_CALL(personal_data_manager(), Refresh());
   StartSyncService(add_autofill.callback(), false, AUTOFILL_PROFILE);
   ASSERT_TRUE(add_autofill.success());
 
   AutofillProfileChange change(AutofillProfileChange::REMOVE,
                                sync_profile.guid(), NULL);
@@ skipping 57 matching lines @@
   ASSERT_TRUE(GetAutofillEntriesFromSyncDB(&sync_entries, &sync_profiles));
   EXPECT_EQ(3U, sync_entries.size());
   EXPECT_EQ(0U, sync_profiles.size());
   for (size_t i = 0; i < sync_entries.size(); i++) {
     DVLOG(1) << "Entry " << i << ": " << sync_entries[i].key().name() << ", "
              << sync_entries[i].key().value();
   }
 }
 
 }  // namespace browser_sync