components/autofill: scoped_ptr -> unique_ptr

components/autofill/core/browser/name_field.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 "components/autofill/core/browser/name_field.h"
 
+#include <memory>
+
 #include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
+#include "base/memory/ptr_util.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/autofill/core/browser/autofill_regex_constants.h"
 #include "components/autofill/core/browser/autofill_scanner.h"
 #include "components/autofill/core/browser/autofill_type.h"
 
 using base::UTF8ToUTF16;
 
 namespace autofill {
 namespace {
 
 // A form field that can parse a full name field.
 class FullNameField : public NameField {
  public:
-  static scoped_ptr<FullNameField> Parse(AutofillScanner* scanner);
+  static std::unique_ptr<FullNameField> Parse(AutofillScanner* scanner);
 
  protected:
   void AddClassifications(FieldCandidatesMap* field_candidates) const override;
 
  private:
   explicit FullNameField(AutofillField* field);
 
   AutofillField* field_;
 
   DISALLOW_COPY_AND_ASSIGN(FullNameField);
 };
 
 // A form field that can parse a first and last name field.
 class FirstLastNameField : public NameField {
  public:
-  static scoped_ptr<FirstLastNameField> ParseSpecificName(
+  static std::unique_ptr<FirstLastNameField> ParseSpecificName(
       AutofillScanner* scanner);
-  static scoped_ptr<FirstLastNameField> ParseComponentNames(
+  static std::unique_ptr<FirstLastNameField> ParseComponentNames(
       AutofillScanner* scanner);
-  static scoped_ptr<FirstLastNameField> Parse(AutofillScanner* scanner);
+  static std::unique_ptr<FirstLastNameField> Parse(AutofillScanner* scanner);
 
  protected:
   void AddClassifications(FieldCandidatesMap* field_candidates) const override;
 
  private:
   FirstLastNameField();
 
   AutofillField* first_name_;
   AutofillField* middle_name_;  // Optional.
   AutofillField* last_name_;
   bool middle_initial_;  // True if middle_name_ is a middle initial.
 
   DISALLOW_COPY_AND_ASSIGN(FirstLastNameField);
 };
 
 }  // namespace
 
 // static
-scoped_ptr<FormField> NameField::Parse(AutofillScanner* scanner) {
+std::unique_ptr<FormField> NameField::Parse(AutofillScanner* scanner) {
   if (scanner->IsEnd())
     return NULL;
 
   // Try FirstLastNameField first since it's more specific.
-  scoped_ptr<FormField> field = FirstLastNameField::Parse(scanner);
+  std::unique_ptr<FormField> field = FirstLastNameField::Parse(scanner);
   if (!field)
     field = FullNameField::Parse(scanner);
   return field;
 }
 
 // This is overriden in concrete subclasses.
 void NameField::AddClassifications(FieldCandidatesMap* field_candidates) const {
 }
 
 // static
-scoped_ptr<FullNameField> FullNameField::Parse(AutofillScanner* scanner) {
+std::unique_ptr<FullNameField> FullNameField::Parse(AutofillScanner* scanner) {
   // Exclude e.g. "username" or "nickname" fields.
   scanner->SaveCursor();
   bool should_ignore = ParseField(scanner, UTF8ToUTF16(kNameIgnoredRe), NULL);
   scanner->Rewind();
   if (should_ignore)
     return NULL;
 
   // Searching for any label containing the word "name" is too general;
   // for example, Travelocity_Edit travel profile.html contains a field
   // "Travel Profile Name".
   AutofillField* field = NULL;
   if (ParseField(scanner, UTF8ToUTF16(kNameRe), &field))
-    return make_scoped_ptr(new FullNameField(field));
+    return base::WrapUnique(new FullNameField(field));
 
   return NULL;
 }
 
 void FullNameField::AddClassifications(
     FieldCandidatesMap* field_candidates) const {
   AddClassification(field_, NAME_FULL, kBaseNameParserScore, field_candidates);
 }
 
 FullNameField::FullNameField(AutofillField* field) : field_(field) {
 }
 
-scoped_ptr<FirstLastNameField> FirstLastNameField::ParseSpecificName(
+std::unique_ptr<FirstLastNameField> FirstLastNameField::ParseSpecificName(
     AutofillScanner* scanner) {
   // Some pages (e.g. Overstock_comBilling.html, SmithsonianCheckout.html)
   // have the label "Name" followed by two or three text fields.
-  scoped_ptr<FirstLastNameField> v(new FirstLastNameField);
+  std::unique_ptr<FirstLastNameField> v(new FirstLastNameField);
   scanner->SaveCursor();
 
   AutofillField* next = NULL;
   if (ParseField(scanner, UTF8ToUTF16(kNameSpecificRe), &v->first_name_) &&
       ParseEmptyLabel(scanner, &next)) {
     if (ParseEmptyLabel(scanner, &v->last_name_)) {
       // There are three name fields; assume that the middle one is a
       // middle initial (it is, at least, on SmithsonianCheckout.html).
       v->middle_name_ = next;
       v->middle_initial_ = true;
     } else {  // only two name fields
       v->last_name_ = next;
     }
 
     return v;
   }
 
   scanner->Rewind();
   return NULL;
 }
 
 // static
-scoped_ptr<FirstLastNameField> FirstLastNameField::ParseComponentNames(
+std::unique_ptr<FirstLastNameField> FirstLastNameField::ParseComponentNames(
     AutofillScanner* scanner) {
-  scoped_ptr<FirstLastNameField> v(new FirstLastNameField);
+  std::unique_ptr<FirstLastNameField> v(new FirstLastNameField);
   scanner->SaveCursor();
 
   // A fair number of pages use the names "fname" and "lname" for naming
   // first and last name fields (examples from the test suite:
   // BESTBUY_COM - Sign In2.html; Crate and Barrel Check Out.html;
   // dell_checkout1.html).  At least one UK page (The China Shop2.html)
   // asks, in stuffy English style, for just initials and a surname,
   // so we match "initials" here (and just fill in a first name there,
   // American-style).
   // The ".*first$" matches fields ending in "first" (example in sample8.html).
@@ skipping 39 matching lines @@
   // Consider the match to be successful if we detected both first and last name
   // fields.
   if (v->first_name_ && v->last_name_)
     return v;
 
   scanner->Rewind();
   return NULL;
 }
 
 // static
-scoped_ptr<FirstLastNameField> FirstLastNameField::Parse(
+std::unique_ptr<FirstLastNameField> FirstLastNameField::Parse(
     AutofillScanner* scanner) {
-  scoped_ptr<FirstLastNameField> field = ParseSpecificName(scanner);
+  std::unique_ptr<FirstLastNameField> field = ParseSpecificName(scanner);
   if (!field)
     field = ParseComponentNames(scanner);
   return field;
 }
 
 FirstLastNameField::FirstLastNameField()
     : first_name_(NULL),
       middle_name_(NULL),
       last_name_(NULL),
       middle_initial_(false) {
 }
 
 void FirstLastNameField::AddClassifications(
     FieldCandidatesMap* field_candidates) const {
   AddClassification(first_name_, NAME_FIRST, kBaseNameParserScore,
                     field_candidates);
   AddClassification(last_name_, NAME_LAST, kBaseNameParserScore,
                     field_candidates);
   const ServerFieldType type =
       middle_initial_ ? NAME_MIDDLE_INITIAL : NAME_MIDDLE;
   AddClassification(middle_name_, type, kBaseNameParserScore, field_candidates);
 }
 
 }  // namespace autofill