Remove stl_util's STLDeleteContainerPointers from autofill.

components/autofill/core/browser/autofill_assistant_unittest.cc

 // Copyright 2016 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/autofill/core/browser/autofill_assistant.h"
 
 #include <memory>
 
 #include "base/callback.h"
 #include "base/feature_list.h"
@@ skipping 107 matching lines @@
 
 MATCHER_P(CreditCardMatches, guid, "") {
   return arg.guid() == guid;
 }
 
 // If the feature is turned off, CanShowCreditCardAssist() always returns
 // false.
 TEST_F(AutofillAssistantTest, CanShowCreditCardAssist_FeatureOff) {
   std::unique_ptr<FormStructure> form_structure = CreateValidCreditCardForm();
 
-  std::vector<FormStructure*> form_structures{form_structure.get()};
+  std::vector<std::unique_ptr<FormStructure>> form_structures;
+  form_structures.push_back(std::move(form_structure));
   EXPECT_FALSE(autofill_assistant_.CanShowCreditCardAssist(form_structures));
 }
 
 // Tests that with the feature enabled and proper input,
 // CanShowCreditCardAssist() behaves as expected.
 TEST_F(AutofillAssistantTest, CanShowCreditCardAssist_FeatureOn) {
   EnableAutofillCreditCardAssist();
   std::unique_ptr<FormStructure> form_structure = CreateValidCreditCardForm();
 
-  std::vector<FormStructure*> form_structures;
+  std::vector<std::unique_ptr<FormStructure>> form_structures;
   EXPECT_FALSE(autofill_assistant_.CanShowCreditCardAssist(form_structures));
 
   // With valid input, the function extracts the credit card form properly.
-  form_structures.push_back(form_structure.get());
+  form_structures.push_back(std::move(form_structure));
   EXPECT_TRUE(autofill_assistant_.CanShowCreditCardAssist(form_structures));
 }
 
 // Tests that with the feature enabled and proper input,
 // CanShowCreditCardAssist() behaves as expected for secure vs insecure
 // contexts.
 TEST_F(AutofillAssistantTest, CanShowCreditCardAssist_FeatureOn_NotSecure) {
   EnableAutofillCreditCardAssist();
 
   {
     // Cannot be shown if the context is not secure.
     FormData form = CreateValidCreditCardFormData();
     form.action = GURL("http://myform.com");
     form.action = GURL("http://myform.com/submit");
     std::unique_ptr<FormStructure> form_structure(new FormStructure(form));
     form_structure->DetermineHeuristicTypes();
 
-    std::vector<FormStructure*> form_structures;
-    form_structures.push_back(form_structure.get());
+    std::vector<std::unique_ptr<FormStructure>> form_structures;
+    form_structures.push_back(std::move(form_structure));
     EXPECT_FALSE(autofill_assistant_.CanShowCreditCardAssist(form_structures));
   }
 
   {
     // Can be shown if the context is secure.
     FormData form = CreateValidCreditCardFormData();
     std::unique_ptr<FormStructure> form_structure(new FormStructure(form));
     form_structure->DetermineHeuristicTypes();
 
-    std::vector<FormStructure*> form_structures;
-    form_structures.push_back(form_structure.get());
+    std::vector<std::unique_ptr<FormStructure>> form_structures;
+    form_structures.push_back(std::move(form_structure));
     EXPECT_TRUE(autofill_assistant_.CanShowCreditCardAssist(form_structures));
   }
 }
 
 TEST_F(AutofillAssistantTest, ShowAssistForCreditCard_ValidCard_CancelCvc) {
   EnableAutofillCreditCardAssist();
   std::unique_ptr<FormStructure> form_structure = CreateValidCreditCardForm();
 
   // Will extract the credit card form data.
-  std::vector<FormStructure*> form_structures{form_structure.get()};
+  std::vector<std::unique_ptr<FormStructure>> form_structures;
+  form_structures.push_back(std::move(form_structure));
   EXPECT_TRUE(autofill_assistant_.CanShowCreditCardAssist(form_structures));
 
   // Create a valid card for the assist.
   CreditCard card;
   test::SetCreditCardInfo(&card, "John Doe", "4111111111111111", "05", "2999");
 
   // FillCreditCardForm should not be called if the user cancelled the CVC.
   EXPECT_CALL(autofill_manager_, FillCreditCardForm(_, _, _, _, _)).Times(0);
 
   autofill_assistant_.ShowAssistForCreditCard(card);
   static_cast<CardUnmaskDelegate*>(
       autofill_manager_.GetOrCreateFullCardRequest())
       ->OnUnmaskPromptClosed();
 }
 
 TEST_F(AutofillAssistantTest, ShowAssistForCreditCard_ValidCard_SubmitCvc) {
   EnableAutofillCreditCardAssist();
   std::unique_ptr<FormStructure> form_structure = CreateValidCreditCardForm();
 
   // Will extract the credit card form data.
-  std::vector<FormStructure*> form_structures{form_structure.get()};
+  std::vector<std::unique_ptr<FormStructure>> form_structures;
+  form_structures.push_back(std::move(form_structure));
   EXPECT_TRUE(autofill_assistant_.CanShowCreditCardAssist(form_structures));
 
   // Create a valid card for the assist.
   CreditCard card;
   test::SetCreditCardInfo(&card, "John Doe", "4111111111111111", "05", "2999");
 
   // FillCreditCardForm ends up being called after user has accepted the
   // prompt.
   EXPECT_CALL(
       autofill_manager_,
       FillCreditCardForm(kNoQueryId, _, _, CreditCardMatches(card.guid()),
                          base::ASCIIToUTF16("123")));
 
   autofill_assistant_.ShowAssistForCreditCard(card);
 
   CardUnmaskDelegate::UnmaskResponse unmask_response;
   unmask_response.cvc = base::ASCIIToUTF16("123");
   static_cast<CardUnmaskDelegate*>(
       autofill_manager_.GetOrCreateFullCardRequest())
       ->OnUnmaskResponse(unmask_response);
 }
 
 }  // namespace autofill