Remove stl_util's STLDeleteContainerPointers from autofill.

components/autofill/core/browser/autofill_manager.h

Index: components/autofill/core/browser/autofill_manager.h
diff --git a/components/autofill/core/browser/autofill_manager.h b/components/autofill/core/browser/autofill_manager.h
index c93d0247631e9cea6c106daf674ba1abb608ab41..f3d3e2f762e8271d3fc262f0cda24476164aef63 100644
--- a/components/autofill/core/browser/autofill_manager.h
+++ b/components/autofill/core/browser/autofill_manager.h
@@ -15,7 +15,6 @@
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
-#include "base/memory/scoped_vector.h"

[vabr (Chromium), 2016/10/14 07:24:43]

optional: Perhaps mention removing ScopedVector in the description explicitly
and maybe add http://crbug.com/554289 to the list in BUG?
Up to you, I'm also fine with not doing that.

[vabr (Chromium), 2016/10/14 07:27:25]

I see that you already have 554289 in BUG, please ignore that part of my
comment.

[Avi (use Gerrit), 2016/10/16 20:05:53]

Done.

 #include "base/memory/weak_ptr.h"
 #include "base/strings/string16.h"
 #include "base/time/time.h"
@@ -141,7 +140,7 @@ class AutofillManager : public AutofillDownloadManager::Observer,
   bool IsShowingUnmaskPrompt();
 
   // Returns the present form structures seen by Autofill manager.
-  const std::vector<FormStructure*>& GetFormStructures();
+  const std::vector<std::unique_ptr<FormStructure>>& GetFormStructures();
 
   AutofillClient* client() { return client_; }
 
@@ -253,7 +252,9 @@ class AutofillManager : public AutofillDownloadManager::Observer,
                        std::string* cc_backend_id,
                        std::string* profile_backend_id) const;
 
-  ScopedVector<FormStructure>* form_structures() { return &form_structures_; }
+  std::vector<std::unique_ptr<FormStructure>>* form_structures() {
+    return &form_structures_;
+  }
 
   // Exposed for testing.
   AutofillExternalDelegate* external_delegate() {
@@ -498,7 +499,7 @@ class AutofillManager : public AutofillDownloadManager::Observer,
   base::TimeTicks initial_interaction_timestamp_;
 
   // Our copy of the form data.
-  ScopedVector<FormStructure> form_structures_;
+  std::vector<std::unique_ptr<FormStructure>> form_structures_;
 
   // A copy of the currently interacted form data.
   std::unique_ptr<FormData> pending_form_data_;