Remove stl_util's STLDeleteContainerPointers from autofill.

components/browsing_data/core/counters/autofill_counter.cc

 // Copyright 2015 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 "components/browsing_data/core/counters/autofill_counter.h"
 
 #include <algorithm>
 #include <utility>
 #include <vector>
 
-#include "base/memory/scoped_vector.h"
 #include "components/autofill/core/browser/autofill_profile.h"
 #include "components/autofill/core/browser/credit_card.h"
 #include "components/autofill/core/browser/webdata/autofill_webdata_service.h"
 #include "components/browsing_data/core/pref_names.h"
 
 namespace browsing_data {
 
 AutofillCounter::AutofillCounter(
     scoped_refptr<autofill::AutofillWebDataService> web_data_service)
     : web_data_service_(web_data_service),
@@ skipping 51 matching lines @@
 
   // Count the credit cards.
   credit_cards_query_ = web_data_service_->GetCreditCards(this);
 
   // Count the addresses.
   addresses_query_ = web_data_service_->GetAutofillProfiles(this);
 }
 
 void AutofillCounter::OnWebDataServiceRequestDone(
     WebDataServiceBase::Handle handle,
-    const WDTypedResult* result) {
+    std::unique_ptr<WDTypedResult> result) {
   DCHECK(thread_checker_.CalledOnValidThread());
   if (!result) {
     CancelAllRequests();
     return;
   }
 
   const base::Time start = period_start_for_testing_.is_null()
                                ? GetPeriodStart()
                                : period_start_for_testing_;
 
   if (handle == suggestions_query_) {
     // Autocomplete suggestions.
     DCHECK_EQ(AUTOFILL_VALUE_RESULT, result->GetType());
-    num_suggestions_ = static_cast<const WDResult<int>*>(result)->GetValue();
+    num_suggestions_ =
+        static_cast<const WDResult<int>*>(result.get())->GetValue();
     suggestions_query_ = 0;
 
   } else if (handle == credit_cards_query_) {
     // Credit cards.
     DCHECK_EQ(AUTOFILL_CREDITCARDS_RESULT, result->GetType());
-    const std::vector<autofill::CreditCard*> credit_cards =
-        static_cast<const WDResult<std::vector<autofill::CreditCard*>>*>(result)
-            ->GetValue();
-
-    // We own the result from this query. Make sure it will be deleted.
-    ScopedVector<const autofill::CreditCard> owned_result;
-    owned_result.assign(credit_cards.begin(), credit_cards.end());
+    std::vector<std::unique_ptr<autofill::CreditCard>> credit_cards = std::move(
+        static_cast<
+            WDResult<std::vector<std::unique_ptr<autofill::CreditCard>>>*>(
+            result.get())
+            ->GetValue());
 
     num_credit_cards_ = std::count_if(
-        credit_cards.begin(),
-        credit_cards.end(),
-        [start](const autofill::CreditCard* card) {
+        credit_cards.begin(), credit_cards.end(),
+        [start](const std::unique_ptr<autofill::CreditCard>& card) {
           return card->modification_date() >= start;
         });
     credit_cards_query_ = 0;
 
   } else if (handle == addresses_query_) {
     // Addresses.
     DCHECK_EQ(AUTOFILL_PROFILES_RESULT, result->GetType());
-    const std::vector<autofill::AutofillProfile*> addresses =
-        static_cast<const WDResult<std::vector<autofill::AutofillProfile*>>*>(
-            result)
-            ->GetValue();
+    std::vector<std::unique_ptr<autofill::AutofillProfile>> addresses =
+        std::move(
+            static_cast<WDResult<
+                std::vector<std::unique_ptr<autofill::AutofillProfile>>>*>(
+                result.get())
+                ->GetValue());
 
-    // We own the result from this query. Make sure it will be deleted.
-    ScopedVector<const autofill::AutofillProfile> owned_result;
-    owned_result.assign(addresses.begin(), addresses.end());
-
-    num_addresses_ =
-        std::count_if(addresses.begin(), addresses.end(),
-                      [start](const autofill::AutofillProfile* address) {
-                        return address->modification_date() >= start;
-                      });
+    num_addresses_ = std::count_if(
+        addresses.begin(), addresses.end(),
+        [start](const std::unique_ptr<autofill::AutofillProfile>& address) {
+          return address->modification_date() >= start;
+        });
     addresses_query_ = 0;
 
   } else {
     NOTREACHED() << "No such query: " << handle;
   }
 
   // If we still have pending queries, do not report data yet.
   if (HasPendingQuery())
     return;
 
@@ skipping 17 matching lines @@
                                                 ResultInt num_suggestions,
                                                 ResultInt num_credit_cards,
                                                 ResultInt num_addresses)
     : FinishedResult(source, num_suggestions),
       num_credit_cards_(num_credit_cards),
       num_addresses_(num_addresses) {}
 
 AutofillCounter::AutofillResult::~AutofillResult() {}
 
 }  // namespace browsing_data