Remove ScopedVector from autofill.

components/autofill/core/browser/form_structure.h

 // 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.
 
 #ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_FORM_STRUCTURE_H_
 #define COMPONENTS_AUTOFILL_CORE_BROWSER_FORM_STRUCTURE_H_
 
 #include <stddef.h>
 
+#include <memory>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
-#include "base/memory/scoped_vector.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_piece.h"
 #include "components/autofill/core/browser/autofill_field.h"
 #include "components/autofill/core/browser/autofill_type.h"
 #include "components/autofill/core/browser/field_types.h"
 #include "components/autofill/core/browser/proto/server.pb.h"
 #include "url/gurl.h"
 
 enum UploadRequired {
   UPLOAD_NOT_REQUIRED,
@@ skipping 11 matching lines @@
 
 namespace autofill {
 
 struct FormData;
 struct FormDataPredictions;
 
 // FormStructure stores a single HTML form together with the values entered
 // in the fields along with additional information needed by Autofill.
 class FormStructure {
  public:
+  using FieldsVector = std::vector<std::unique_ptr<AutofillField>>;

[vabr (Chromium), 2017/01/02 08:30:21]

nit: I'm not completely sure if this alias is helpful. While shorter, it does
not convey the ownership. Would it be a big pain to just inline the long type
instead?

[Avi (use Gerrit), 2017/01/02 20:32:03]

Done.

+
   explicit FormStructure(const FormData& form);
   virtual ~FormStructure();
 
   // Runs several heuristics against the form fields to determine their possible
   // types.
   void DetermineHeuristicTypes();
 
   // Encodes the proto |upload| request from this FormStructure.
   // In some cases, a |login_form_signature| is included as part of the upload.
   // This field is empty when sending upload requests for non-login forms.
@@ skipping 122 matching lines @@
   size_t field_count() const;
 
   // Returns the number of fields that are part of the form signature and that
   // are included in queries to the Autofill server.
   size_t active_field_count() const;
 
   // Returns the number of fields that are able to be autofilled.
   size_t autofill_count() const { return autofill_count_; }
 
   // Used for iterating over the fields.
-  std::vector<AutofillField*>::const_iterator begin() const {
-    return fields_.begin();
-  }
-  std::vector<AutofillField*>::const_iterator end() const {
-    return fields_.end();
-  }
+  FieldsVector::const_iterator begin() const { return fields_.begin(); }
+  FieldsVector::const_iterator end() const { return fields_.end(); }
 
   const base::string16& form_name() const { return form_name_; }
 
   const GURL& source_url() const { return source_url_; }
 
   const GURL& target_url() const { return target_url_; }
 
   bool has_author_specified_types() { return has_author_specified_types_; }
 
   bool has_author_specified_sections() {
@@ skipping 60 matching lines @@
   // The source URL.
   GURL source_url_;
 
   // The target URL.
   GURL target_url_;
 
   // The number of fields able to be auto-filled.
   size_t autofill_count_;
 
   // A vector of all the input fields in the form.
-  ScopedVector<AutofillField> fields_;
+  FieldsVector fields_;
 
   // The number of fields that are part of the form signature and that are
   // included in queries to the Autofill server.
   size_t active_field_count_;
 
   // Whether the server expects us to always upload, never upload, or default
   // to the stored upload rates.
   UploadRequired upload_required_;
 
   // Whether the form includes any field types explicitly specified by the site
@@ skipping 24 matching lines @@
   // The unique signature for this form, composed of the target url domain,
   // the form name, and the form field names in a 64-bit hash.
   FormSignature form_signature_;
 
   DISALLOW_COPY_AND_ASSIGN(FormStructure);
 };
 
 }  // namespace autofill
 
 #endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_FORM_STRUCTURE_H_