components/autofill: scoped_ptr -> unique_ptr

components/autofill/core/browser/address_field_unittest.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/address_field.h"
+
+#include <memory>
+
 #include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
+#include "base/memory/ptr_util.h"
 #include "base/memory/scoped_vector.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
-#include "components/autofill/core/browser/address_field.h"
 #include "components/autofill/core/browser/autofill_field.h"
 #include "components/autofill/core/browser/autofill_scanner.h"
 #include "components/autofill/core/common/form_field_data.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using base::ASCIIToUTF16;
 
 namespace autofill {
 
 class AddressFieldTest : public testing::Test {
  public:
   AddressFieldTest() {}
 
  protected:
   ScopedVector<AutofillField> list_;
-  scoped_ptr<AddressField> field_;
+  std::unique_ptr<AddressField> field_;
   FieldCandidatesMap field_candidates_map_;
 
   // Downcast for tests.
-  static scoped_ptr<AddressField> Parse(AutofillScanner* scanner) {
-    scoped_ptr<FormField> field = AddressField::Parse(scanner);
-    return make_scoped_ptr(static_cast<AddressField*>(field.release()));
+  static std::unique_ptr<AddressField> Parse(AutofillScanner* scanner) {
+    std::unique_ptr<FormField> field = AddressField::Parse(scanner);
+    return base::WrapUnique(static_cast<AddressField*>(field.release()));
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(AddressFieldTest);
 };
 
 TEST_F(AddressFieldTest, Empty) {
   AutofillScanner scanner(list_.get());
   field_ = Parse(&scanner);
   ASSERT_EQ(nullptr, field_.get());
@@ skipping 214 matching lines @@
   ASSERT_NE(nullptr, field_.get());
   field_->AddClassifications(&field_candidates_map_);
   ASSERT_TRUE(field_candidates_map_.find(ASCIIToUTF16("company1")) !=
               field_candidates_map_.end());
   EXPECT_EQ(
       COMPANY_NAME,
       field_candidates_map_[ASCIIToUTF16("company1")].BestHeuristicType());
 }
 
 }  // namespace autofill