Remove stl_util's STLDeleteContainerPointers from autofill.

components/autofill/core/browser/autofill_merge_unittest.cc

 // Copyright 2013 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 <map>
 #include <memory>
 #include <vector>
 
 #include "base/feature_list.h"
 #include "base/files/file_enumerator.h"
 #include "base/files/file_path.h"
 #include "base/macros.h"
+#include "base/memory/ptr_util.h"
 #include "base/path_service.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/test/scoped_feature_list.h"
 #include "components/autofill/core/browser/autofill_experiments.h"
 #include "components/autofill/core/browser/autofill_test_utils.h"
 #include "components/autofill/core/browser/autofill_type.h"
 #include "components/autofill/core/browser/country_names.h"
 #include "components/autofill/core/browser/data_driven_test.h"
@@ skipping 87 matching lines @@
 class PersonalDataManagerMock : public PersonalDataManager {
  public:
   PersonalDataManagerMock();
   ~PersonalDataManagerMock() override;
 
   // Reset the saved profiles.
   void Reset();
 
   // PersonalDataManager:
   std::string SaveImportedProfile(const AutofillProfile& profile) override;
-  const std::vector<AutofillProfile*>& web_profiles() const override;
+  std::vector<AutofillProfile*> web_profiles() const override;
 
  private:
-  ScopedVector<AutofillProfile> profiles_;
+  std::vector<std::unique_ptr<AutofillProfile>> profiles_;
 
   DISALLOW_COPY_AND_ASSIGN(PersonalDataManagerMock);
 };
 
 PersonalDataManagerMock::PersonalDataManagerMock()
     : PersonalDataManager("en-US") {
 }
 
 PersonalDataManagerMock::~PersonalDataManagerMock() {
 }
 
 void PersonalDataManagerMock::Reset() {
   profiles_.clear();
 }
 
 std::string PersonalDataManagerMock::SaveImportedProfile(
     const AutofillProfile& profile) {
   std::vector<AutofillProfile> profiles;
   std::string merged_guid =
-      MergeProfile(profile, profiles_.get(), "en-US", &profiles);
+      MergeProfile(profile, &profiles_, "en-US", &profiles);
   if (merged_guid == profile.guid())
-    profiles_.push_back(new AutofillProfile(profile));
+    profiles_.push_back(base::MakeUnique<AutofillProfile>(profile));
   return merged_guid;
 }
 
-const std::vector<AutofillProfile*>& PersonalDataManagerMock::web_profiles()
-    const {
-  return profiles_.get();
+std::vector<AutofillProfile*> PersonalDataManagerMock::web_profiles() const {
+  std::vector<AutofillProfile*> result;
+  for (const auto& profile : profiles_)
+    result.push_back(profile.get());
+  return result;
 }
 
 }  // namespace
 
 // A data-driven test for verifying merging of Autofill profiles. Each input is
 // a structured dump of a set of implicitly detected autofill profiles. The
 // corresponding output file is a dump of the saved profiles that result from
 // importing the input profiles. The output file format is identical to the
 // input format.
 class AutofillMergeTest : public DataDrivenTest,
@@ skipping 125 matching lines @@
   return string_to_field_type_map_[str];
 }
 
 TEST_P(AutofillMergeTest, DataDrivenMergeProfiles) {
   RunOneDataDrivenTest(GetParam(), GetOutputDirectory(kTestName));
 }
 
 INSTANTIATE_TEST_CASE_P(, AutofillMergeTest, testing::ValuesIn(GetTestFiles()));
 
 }  // namespace autofill