Remove ScopedVector from autofill.

components/autofill/core/browser/autofill_profile_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/autofill_profile.h"
 
 #include <stddef.h>
 
 #include <memory>
+#include <vector>
 
 #include "base/format_macros.h"
 #include "base/guid.h"
 #include "base/macros.h"
-#include "base/memory/scoped_vector.h"
+#include "base/memory/ptr_util.h"
 #include "base/stl_util.h"
 #include "base/strings/string16.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/autofill/core/browser/autofill_test_utils.h"
 #include "components/autofill/core/browser/autofill_type.h"
 #include "components/autofill/core/browser/field_types.h"
 #include "components/autofill/core/common/autofill_constants.h"
 #include "components/autofill/core/common/form_field_data.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 47 matching lines @@
 };
 
 void SetupTestProfile(AutofillProfile& profile) {
   profile.set_guid(base::GenerateGUID());
   profile.set_origin(kSettingsOrigin);
   test::SetProfileInfo(&profile, "Marion", "Mitchell", "Morrison",
                        "marion@me.xyz", "Fox", "123 Zoo St.", "unit 5",
                        "Hollywood", "CA", "91601", "US", "12345678910");
 }
 
+std::vector<AutofillProfile*> ToRawPointerVector(
+    const std::vector<std::unique_ptr<AutofillProfile>>& list) {
+  std::vector<AutofillProfile*> result;
+  for (const auto& item : list)
+    result.push_back(item.get());
+  return result;
+}
+
 }  // namespace
 
 // Tests different possibilities for summary string generation.
 // Based on existence of first name, last name, and address line 1.
 TEST(AutofillProfileTest, PreviewSummaryString) {
   // Case 0/null: ""
   AutofillProfile profile0(base::GenerateGUID(), "https://www.example.com/");
   // Empty profile - nothing to update.
   base::string16 summary0 = GetLabel(&profile0);
   EXPECT_EQ(base::string16(), summary0);
@@ skipping 87 matching lines @@
   ASSERT_EQ(profiles.size(), labels.size());
   summary7 = labels[0];
   base::string16 summary7a = labels[1];
   EXPECT_EQ(ASCIIToUTF16(
       "Marion Mitchell Morrison, 123 Zoo St., johnwayne@me.xyz"), summary7);
   EXPECT_EQ(ASCIIToUTF16(
       "Marion Mitchell Morrison, 123 Zoo St., marion@me.xyz"), summary7a);
 }
 
 TEST(AutofillProfileTest, AdjustInferredLabels) {
-  ScopedVector<AutofillProfile> profiles;
-  profiles.push_back(
-      new AutofillProfile(base::GenerateGUID(), "https://www.example.com/"));
-  test::SetProfileInfo(
-      profiles[0],
-      "John",
-      "",
-      "Doe",
-      "johndoe@hades.com",
-      "Underworld",
-      "666 Erebus St.",
-      "",
-      "Elysium", "CA",
-      "91111",
-      "US",
-      "16502111111");
-  profiles.push_back(
-      new AutofillProfile(base::GenerateGUID(), "http://www.example.com/"));
-  test::SetProfileInfo(
-      profiles[1],
-      "Jane",
-      "",
-      "Doe",
-      "janedoe@tertium.com",
-      "Pluto Inc.",
-      "123 Letha Shore.",
-      "",
-      "Dis", "CA",
-      "91222",
-      "US",
-      "12345678910");
+  std::vector<std::unique_ptr<AutofillProfile>> profiles;
+  profiles.push_back(base::MakeUnique<AutofillProfile>(
+      base::GenerateGUID(), "https://www.example.com/"));
+  test::SetProfileInfo(profiles[0].get(), "John", "", "Doe",
+                       "johndoe@hades.com", "Underworld", "666 Erebus St.", "",
+                       "Elysium", "CA", "91111", "US", "16502111111");
+  profiles.push_back(base::MakeUnique<AutofillProfile>(
+      base::GenerateGUID(), "http://www.example.com/"));
+  test::SetProfileInfo(profiles[1].get(), "Jane", "", "Doe",
+                       "janedoe@tertium.com", "Pluto Inc.", "123 Letha Shore.",
+                       "", "Dis", "CA", "91222", "US", "12345678910");
   std::vector<base::string16> labels;
-  AutofillProfile::CreateDifferentiatingLabels(
-      profiles.get(), "en-US", &labels);
+  AutofillProfile::CreateDifferentiatingLabels(ToRawPointerVector(profiles),
+                                               "en-US", &labels);
   ASSERT_EQ(2U, labels.size());
   EXPECT_EQ(ASCIIToUTF16("John Doe, 666 Erebus St."), labels[0]);
   EXPECT_EQ(ASCIIToUTF16("Jane Doe, 123 Letha Shore."), labels[1]);
 
   profiles.push_back(
-      new AutofillProfile(base::GenerateGUID(), kSettingsOrigin));
-  test::SetProfileInfo(
-      profiles[2],
-      "John",
-      "",
-      "Doe",
-      "johndoe@tertium.com",
-      "Underworld",
-      "666 Erebus St.",
-      "",
-      "Elysium", "CA",
-      "91111",
-      "US",
-      "16502111111");
+      base::MakeUnique<AutofillProfile>(base::GenerateGUID(), kSettingsOrigin));
+  test::SetProfileInfo(profiles[2].get(), "John", "", "Doe",
+                       "johndoe@tertium.com", "Underworld", "666 Erebus St.",
+                       "", "Elysium", "CA", "91111", "US", "16502111111");
   labels.clear();
-  AutofillProfile::CreateDifferentiatingLabels(
-      profiles.get(), "en-US", &labels);
+  AutofillProfile::CreateDifferentiatingLabels(ToRawPointerVector(profiles),
+                                               "en-US", &labels);
 
   // Profile 0 and 2 inferred label now includes an e-mail.
   ASSERT_EQ(3U, labels.size());
   EXPECT_EQ(ASCIIToUTF16("John Doe, 666 Erebus St., johndoe@hades.com"),
             labels[0]);
   EXPECT_EQ(ASCIIToUTF16("Jane Doe, 123 Letha Shore."), labels[1]);
   EXPECT_EQ(ASCIIToUTF16("John Doe, 666 Erebus St., johndoe@tertium.com"),
             labels[2]);
 
   profiles.resize(2);
 
   profiles.push_back(
-      new AutofillProfile(base::GenerateGUID(), std::string()));
-  test::SetProfileInfo(
-      profiles[2],
-      "John",
-      "",
-      "Doe",
-      "johndoe@hades.com",
-      "Underworld",
-      "666 Erebus St.",
-      "",
-      "Elysium", "CO",  // State is different
-      "91111",
-      "US",
-      "16502111111");
+      base::MakeUnique<AutofillProfile>(base::GenerateGUID(), std::string()));
+  test::SetProfileInfo(profiles[2].get(), "John", "", "Doe",
+                       "johndoe@hades.com", "Underworld", "666 Erebus St.", "",
+                       "Elysium", "CO",  // State is different
+                       "91111", "US", "16502111111");
 
   labels.clear();
-  AutofillProfile::CreateDifferentiatingLabels(
-      profiles.get(), "en-US", &labels);
+  AutofillProfile::CreateDifferentiatingLabels(ToRawPointerVector(profiles),
+                                               "en-US", &labels);
 
   // Profile 0 and 2 inferred label now includes a state.
   ASSERT_EQ(3U, labels.size());
   EXPECT_EQ(ASCIIToUTF16("John Doe, 666 Erebus St., CA"), labels[0]);
   EXPECT_EQ(ASCIIToUTF16("Jane Doe, 123 Letha Shore."), labels[1]);
   EXPECT_EQ(ASCIIToUTF16("John Doe, 666 Erebus St., CO"), labels[2]);
 
-  profiles.push_back(
-      new AutofillProfile(base::GenerateGUID(), "https://www.example.com/"));
-  test::SetProfileInfo(
-      profiles[3],
-      "John",
-      "",
-      "Doe",
-      "johndoe@hades.com",
-      "Underworld",
-      "666 Erebus St.",
-      "",
-      "Elysium", "CO",  // State is different for some.
-      "91111",
-      "US",
-      "16504444444");  // Phone is different for some.
+  profiles.push_back(base::MakeUnique<AutofillProfile>(
+      base::GenerateGUID(), "https://www.example.com/"));
+  test::SetProfileInfo(profiles[3].get(), "John", "", "Doe",
+                       "johndoe@hades.com", "Underworld", "666 Erebus St.", "",
+                       "Elysium", "CO",  // State is different for some.
+                       "91111", "US",
+                       "16504444444");  // Phone is different for some.
 
   labels.clear();
-  AutofillProfile::CreateDifferentiatingLabels(
-      profiles.get(), "en-US", &labels);
+  AutofillProfile::CreateDifferentiatingLabels(ToRawPointerVector(profiles),
+                                               "en-US", &labels);
   ASSERT_EQ(4U, labels.size());
   EXPECT_EQ(ASCIIToUTF16("John Doe, 666 Erebus St., CA"), labels[0]);
   EXPECT_EQ(ASCIIToUTF16("Jane Doe, 123 Letha Shore."), labels[1]);
   EXPECT_EQ(ASCIIToUTF16("John Doe, 666 Erebus St., CO, 16502111111"),
             labels[2]);
   // This one differs from other ones by unique phone, so no need for extra
   // information.
   EXPECT_EQ(ASCIIToUTF16("John Doe, 666 Erebus St., CO, 16504444444"),
             labels[3]);
 
-  profiles.push_back(
-      new AutofillProfile(base::GenerateGUID(), "https://www.example.com/"));
-  test::SetProfileInfo(
-      profiles[4],
-      "John",
-      "",
-      "Doe",
-      "johndoe@styx.com",  // E-Mail is different for some.
-      "Underworld",
-      "666 Erebus St.",
-      "",
-      "Elysium", "CO",  // State is different for some.
-      "91111",
-      "US",
-      "16504444444");  // Phone is different for some.
+  profiles.push_back(base::MakeUnique<AutofillProfile>(
+      base::GenerateGUID(), "https://www.example.com/"));
+  test::SetProfileInfo(profiles[4].get(), "John", "", "Doe",
+                       "johndoe@styx.com",  // E-Mail is different for some.
+                       "Underworld", "666 Erebus St.", "", "Elysium",
+                       "CO",  // State is different for some.
+                       "91111", "US",
+                       "16504444444");  // Phone is different for some.
 
   labels.clear();
-  AutofillProfile::CreateDifferentiatingLabels(
-      profiles.get(), "en-US", &labels);
+  AutofillProfile::CreateDifferentiatingLabels(ToRawPointerVector(profiles),
+                                               "en-US", &labels);
   ASSERT_EQ(5U, labels.size());
   EXPECT_EQ(ASCIIToUTF16("John Doe, 666 Erebus St., CA"), labels[0]);
   EXPECT_EQ(ASCIIToUTF16("Jane Doe, 123 Letha Shore."), labels[1]);
   EXPECT_EQ(ASCIIToUTF16("John Doe, 666 Erebus St., CO, johndoe@hades.com,"
                          " 16502111111"), labels[2]);
   EXPECT_EQ(ASCIIToUTF16("John Doe, 666 Erebus St., CO, johndoe@hades.com,"
                          " 16504444444"), labels[3]);
   // This one differs from other ones by unique e-mail, so no need for extra
   // information.
   EXPECT_EQ(ASCIIToUTF16("John Doe, 666 Erebus St., CO, johndoe@styx.com"),
             labels[4]);
 }
 
 TEST(AutofillProfileTest, CreateInferredLabelsI18n_CH) {
-  ScopedVector<AutofillProfile> profiles;
-  profiles.push_back(
-      new AutofillProfile(base::GenerateGUID(), "https://www.example.com/"));
-  test::SetProfileInfo(profiles.back(),
-                       "H.",
-                       "R.",
-                       "Giger",
-                       "hrgiger@beispiel.com",
-                       "Beispiel Inc",
-                       "Brandschenkestrasse 110",
-                       "",
-                       "Zurich", "",
-                       "8002",
-                       "CH",
-                       "+41 44-668-1800");
+  std::vector<std::unique_ptr<AutofillProfile>> profiles;
+  profiles.push_back(base::MakeUnique<AutofillProfile>(
+      base::GenerateGUID(), "https://www.example.com/"));
+  test::SetProfileInfo(profiles.back().get(), "H.", "R.", "Giger",
+                       "hrgiger@beispiel.com", "Beispiel Inc",
+                       "Brandschenkestrasse 110", "", "Zurich", "", "8002",
+                       "CH", "+41 44-668-1800");
   profiles.back()->set_language_code("de_CH");
   static const char* kExpectedLabels[] = {
     "",
     "H. R. Giger",
     "H. R. Giger, Brandschenkestrasse 110",
     "H. R. Giger, Brandschenkestrasse 110, Zurich",
     "H. R. Giger, Brandschenkestrasse 110, CH-8002 Zurich",
     "Beispiel Inc, H. R. Giger, Brandschenkestrasse 110, CH-8002 Zurich",
     "Beispiel Inc, H. R. Giger, Brandschenkestrasse 110, CH-8002 Zurich, "
         "Switzerland",
     "Beispiel Inc, H. R. Giger, Brandschenkestrasse 110, CH-8002 Zurich, "
         "Switzerland, hrgiger@beispiel.com",
     "Beispiel Inc, H. R. Giger, Brandschenkestrasse 110, CH-8002 Zurich, "
         "Switzerland, hrgiger@beispiel.com, +41 44-668-1800",
   };
 
   std::vector<base::string16> labels;
   for (size_t i = 0; i < arraysize(kExpectedLabels); ++i) {
-    AutofillProfile::CreateInferredLabels(
-        profiles.get(), NULL, UNKNOWN_TYPE, i, "en-US", &labels);
+    AutofillProfile::CreateInferredLabels(ToRawPointerVector(profiles), NULL,
+                                          UNKNOWN_TYPE, i, "en-US", &labels);
     ASSERT_FALSE(labels.empty());
     EXPECT_EQ(UTF8ToUTF16(kExpectedLabels[i]), labels.back());
   }
 }
 
 
 TEST(AutofillProfileTest, CreateInferredLabelsI18n_FR) {
-  ScopedVector<AutofillProfile> profiles;
-  profiles.push_back(
-      new AutofillProfile(base::GenerateGUID(), "https://www.example.com/"));
-  test::SetProfileInfo(profiles.back(),
-                       "Antoine",
-                       "",
-                       "de Saint-Exupéry",
-                       "antoine@exemple.com",
-                       "Exemple Inc",
-                       "8 Rue de Londres",
-                       "",
-                       "Paris", "",
-                       "75009",
-                       "FR",
-                       "+33 (0) 1 42 68 53 00");
+  std::vector<std::unique_ptr<AutofillProfile>> profiles;
+  profiles.push_back(base::MakeUnique<AutofillProfile>(
+      base::GenerateGUID(), "https://www.example.com/"));
+  test::SetProfileInfo(profiles.back().get(), "Antoine", "", "de Saint-Exupéry",
+                       "antoine@exemple.com", "Exemple Inc", "8 Rue de Londres",
+                       "", "Paris", "", "75009", "FR", "+33 (0) 1 42 68 53 00");
   profiles.back()->set_language_code("fr_FR");
   profiles.back()->SetInfo(
       AutofillType(ADDRESS_HOME_SORTING_CODE), UTF8ToUTF16("CEDEX"), "en-US");
   static const char* kExpectedLabels[] = {
       "",
       "Antoine de Saint-Exupéry",
       "Antoine de Saint-Exupéry, 8 Rue de Londres",
       "Antoine de Saint-Exupéry, 8 Rue de Londres, Paris",
       "Antoine de Saint-Exupéry, 8 Rue de Londres, 75009 Paris",
       "Antoine de Saint-Exupéry, 8 Rue de Londres, 75009 Paris CEDEX",
       "Exemple Inc, Antoine de Saint-Exupéry, 8 Rue de Londres, 75009 Paris "
           "CEDEX",
       "Exemple Inc, Antoine de Saint-Exupéry, 8 Rue de Londres, 75009 Paris "
           "CEDEX, France",
       "Exemple Inc, Antoine de Saint-Exupéry, 8 Rue de Londres, 75009 Paris "
           "CEDEX, France, antoine@exemple.com",
       "Exemple Inc, Antoine de Saint-Exupéry, 8 Rue de Londres, 75009 Paris "
           "CEDEX, France, antoine@exemple.com, +33 (0) 1 42 68 53 00",
       "Exemple Inc, Antoine de Saint-Exupéry, 8 Rue de Londres, 75009 Paris "
           "CEDEX, France, antoine@exemple.com, +33 (0) 1 42 68 53 00",
   };
 
   std::vector<base::string16> labels;
   for (size_t i = 0; i < arraysize(kExpectedLabels); ++i) {
-    AutofillProfile::CreateInferredLabels(
-        profiles.get(), NULL, UNKNOWN_TYPE, i, "en-US", &labels);
+    AutofillProfile::CreateInferredLabels(ToRawPointerVector(profiles), NULL,
+                                          UNKNOWN_TYPE, i, "en-US", &labels);
     ASSERT_FALSE(labels.empty());
     EXPECT_EQ(UTF8ToUTF16(kExpectedLabels[i]), labels.back());
   }
 }
 
 TEST(AutofillProfileTest, CreateInferredLabelsI18n_KR) {
-  ScopedVector<AutofillProfile> profiles;
-  profiles.push_back(
-      new AutofillProfile(base::GenerateGUID(), "https://www.example.com/"));
-  test::SetProfileInfo(profiles.back(),
-                       "Park",
-                       "",
-                       "Jae-sang",
-                       "park@yeleul.com",
-                       "Yeleul Inc",
-                       "Gangnam Finance Center",
-                       "152 Teheran-ro",
-                       "Gangnam-Gu", "Seoul",
-                       "135-984",
-                       "KR",
-                       "+82-2-531-9000");
+  std::vector<std::unique_ptr<AutofillProfile>> profiles;
+  profiles.push_back(base::MakeUnique<AutofillProfile>(
+      base::GenerateGUID(), "https://www.example.com/"));
+  test::SetProfileInfo(profiles.back().get(), "Park", "", "Jae-sang",
+                       "park@yeleul.com", "Yeleul Inc",
+                       "Gangnam Finance Center", "152 Teheran-ro", "Gangnam-Gu",
+                       "Seoul", "135-984", "KR", "+82-2-531-9000");
   profiles.back()->set_language_code("ko_Latn");
   profiles.back()->SetInfo(AutofillType(ADDRESS_HOME_DEPENDENT_LOCALITY),
                            UTF8ToUTF16("Yeoksam-Dong"),
                            "en-US");
   static const char* kExpectedLabels[] = {
       "",
       "Park Jae-sang",
       "Park Jae-sang, Gangnam Finance Center",
       "Park Jae-sang, Gangnam Finance Center, 152 Teheran-ro",
       "Park Jae-sang, Gangnam Finance Center, 152 Teheran-ro, Yeoksam-Dong",
@@ skipping 10 matching lines @@
       "Park Jae-sang, Yeleul Inc, Gangnam Finance Center, 152 Teheran-ro, "
           "Yeoksam-Dong, Gangnam-Gu, Seoul, 135-984, South Korea, "
           "park@yeleul.com",
       "Park Jae-sang, Yeleul Inc, Gangnam Finance Center, 152 Teheran-ro, "
           "Yeoksam-Dong, Gangnam-Gu, Seoul, 135-984, South Korea, "
           "park@yeleul.com, +82-2-531-9000",
   };
 
   std::vector<base::string16> labels;
   for (size_t i = 0; i < arraysize(kExpectedLabels); ++i) {
-    AutofillProfile::CreateInferredLabels(
-        profiles.get(), NULL, UNKNOWN_TYPE, i, "en-US", &labels);
+    AutofillProfile::CreateInferredLabels(ToRawPointerVector(profiles), NULL,
+                                          UNKNOWN_TYPE, i, "en-US", &labels);
     ASSERT_FALSE(labels.empty());
     EXPECT_EQ(UTF8ToUTF16(kExpectedLabels[i]), labels.back());
   }
 }
 
 TEST(AutofillProfileTest, CreateInferredLabelsI18n_JP_Latn) {
-  ScopedVector<AutofillProfile> profiles;
-  profiles.push_back(
-      new AutofillProfile(base::GenerateGUID(), "https://www.example.com/"));
-  test::SetProfileInfo(profiles.back(),
-                       "Miku",
-                       "",
-                       "Hatsune",
-                       "miku@rei.com",
-                       "Rei Inc",
-                       "Roppongi Hills Mori Tower",
-                       "6-10-1 Roppongi",
-                       "Minato-ku", "Tokyo",
-                       "106-6126",
-                       "JP",
-                       "+81-3-6384-9000");
+  std::vector<std::unique_ptr<AutofillProfile>> profiles;
+  profiles.push_back(base::MakeUnique<AutofillProfile>(
+      base::GenerateGUID(), "https://www.example.com/"));
+  test::SetProfileInfo(profiles.back().get(), "Miku", "", "Hatsune",
+                       "miku@rei.com", "Rei Inc", "Roppongi Hills Mori Tower",
+                       "6-10-1 Roppongi", "Minato-ku", "Tokyo", "106-6126",
+                       "JP", "+81-3-6384-9000");
   profiles.back()->set_language_code("ja_Latn");
   static const char* kExpectedLabels[] = {
     "",
     "Miku Hatsune",
     "Miku Hatsune, Roppongi Hills Mori Tower",
     "Miku Hatsune, Roppongi Hills Mori Tower, 6-10-1 Roppongi",
     "Miku Hatsune, Roppongi Hills Mori Tower, 6-10-1 Roppongi, Minato-ku",
     "Miku Hatsune, Roppongi Hills Mori Tower, 6-10-1 Roppongi, Minato-ku, "
         "Tokyo",
     "Miku Hatsune, Roppongi Hills Mori Tower, 6-10-1 Roppongi, Minato-ku, "
         "Tokyo, 106-6126",
     "Miku Hatsune, Rei Inc, Roppongi Hills Mori Tower, 6-10-1 Roppongi, "
         "Minato-ku, Tokyo, 106-6126",
     "Miku Hatsune, Rei Inc, Roppongi Hills Mori Tower, 6-10-1 Roppongi, "
         "Minato-ku, Tokyo, 106-6126, Japan",
     "Miku Hatsune, Rei Inc, Roppongi Hills Mori Tower, 6-10-1 Roppongi, "
         "Minato-ku, Tokyo, 106-6126, Japan, miku@rei.com",
     "Miku Hatsune, Rei Inc, Roppongi Hills Mori Tower, 6-10-1 Roppongi, "
         "Minato-ku, Tokyo, 106-6126, Japan, miku@rei.com, +81-3-6384-9000",
   };
 
   std::vector<base::string16> labels;
   for (size_t i = 0; i < arraysize(kExpectedLabels); ++i) {
-    AutofillProfile::CreateInferredLabels(
-        profiles.get(), NULL, UNKNOWN_TYPE, i, "en-US", &labels);
+    AutofillProfile::CreateInferredLabels(ToRawPointerVector(profiles), NULL,
+                                          UNKNOWN_TYPE, i, "en-US", &labels);
     ASSERT_FALSE(labels.empty());
     EXPECT_EQ(UTF8ToUTF16(kExpectedLabels[i]), labels.back());
   }
 }
 
 TEST(AutofillProfileTest, CreateInferredLabelsI18n_JP_ja) {
-  ScopedVector<AutofillProfile> profiles;
-  profiles.push_back(
-      new AutofillProfile(base::GenerateGUID(), "https://www.example.com/"));
-  test::SetProfileInfo(profiles.back(),
-                       "ミク",
-                       "",
-                       "初音",
-                       "miku@rei.com",
-                       "例",
-                       "六本木ヒルズ森タワー",
-                       "六本木 6-10-1",
-                       "港区", "東京都",
-                       "106-6126",
-                       "JP",
+  std::vector<std::unique_ptr<AutofillProfile>> profiles;
+  profiles.push_back(base::MakeUnique<AutofillProfile>(
+      base::GenerateGUID(), "https://www.example.com/"));
+  test::SetProfileInfo(profiles.back().get(), "ミク", "", "初音",
+                       "miku@rei.com", "例", "六本木ヒルズ森タワー",
+                       "六本木 6-10-1", "港区", "東京都", "106-6126", "JP",
                        "03-6384-9000");
   profiles.back()->set_language_code("ja_JP");
   static const char* kExpectedLabels[] = {
     "",
     "初音ミク",
     "六本木ヒルズ森タワー初音ミク",
     "六本木ヒルズ森タワー六本木 6-10-1初音ミク",
     "港区六本木ヒルズ森タワー六本木 6-10-1初音ミク",
     "東京都港区六本木ヒルズ森タワー六本木 6-10-1初音ミク",
     "〒106-6126東京都港区六本木ヒルズ森タワー六本木 6-10-1初音ミク",
     "〒106-6126東京都港区六本木ヒルズ森タワー六本木 6-10-1例初音ミク",
     "〒106-6126東京都港区六本木ヒルズ森タワー六本木 6-10-1例初音ミク, Japan",
     "〒106-6126東京都港区六本木ヒルズ森タワー六本木 6-10-1例初音ミク, Japan, "
         "miku@rei.com",
     "〒106-6126東京都港区六本木ヒルズ森タワー六本木 6-10-1例初音ミク, Japan, "
         "miku@rei.com, 03-6384-9000",
   };
 
   std::vector<base::string16> labels;
   for (size_t i = 0; i < arraysize(kExpectedLabels); ++i) {
-    AutofillProfile::CreateInferredLabels(
-        profiles.get(), NULL, UNKNOWN_TYPE, i, "en-US", &labels);
+    AutofillProfile::CreateInferredLabels(ToRawPointerVector(profiles), NULL,
+                                          UNKNOWN_TYPE, i, "en-US", &labels);
     ASSERT_FALSE(labels.empty());
     EXPECT_EQ(UTF8ToUTF16(kExpectedLabels[i]), labels.back());
   }
 }
 
 TEST(AutofillProfileTest, CreateInferredLabels) {
-  ScopedVector<AutofillProfile> profiles;
-  profiles.push_back(
-      new AutofillProfile(base::GenerateGUID(), "https://www.example.com/"));
-  test::SetProfileInfo(profiles[0],
-                       "John",
-                       "",
-                       "Doe",
-                       "johndoe@hades.com",
-                       "Underworld",
-                       "666 Erebus St.",
-                       "",
-                       "Elysium", "CA",
-                       "91111",
-                       "US",
-                       "16502111111");
-  profiles.push_back(
-      new AutofillProfile(base::GenerateGUID(), "https://www.example.com/"));
-  test::SetProfileInfo(profiles[1],
-                       "Jane",
-                       "",
-                       "Doe",
-                       "janedoe@tertium.com",
-                       "Pluto Inc.",
-                       "123 Letha Shore.",
-                       "",
-                       "Dis", "CA",
-                       "91222",
-                       "US",
-                       "12345678910");
+  std::vector<std::unique_ptr<AutofillProfile>> profiles;
+  profiles.push_back(base::MakeUnique<AutofillProfile>(
+      base::GenerateGUID(), "https://www.example.com/"));
+  test::SetProfileInfo(profiles[0].get(), "John", "", "Doe",
+                       "johndoe@hades.com", "Underworld", "666 Erebus St.", "",
+                       "Elysium", "CA", "91111", "US", "16502111111");
+  profiles.push_back(base::MakeUnique<AutofillProfile>(
+      base::GenerateGUID(), "https://www.example.com/"));
+  test::SetProfileInfo(profiles[1].get(), "Jane", "", "Doe",
+                       "janedoe@tertium.com", "Pluto Inc.", "123 Letha Shore.",
+                       "", "Dis", "CA", "91222", "US", "12345678910");
   std::vector<base::string16> labels;
   // Two fields at least - no filter.
-  AutofillProfile::CreateInferredLabels(profiles.get(), NULL, UNKNOWN_TYPE, 2,
-                                        "en-US", &labels);
+  AutofillProfile::CreateInferredLabels(ToRawPointerVector(profiles), NULL,
+                                        UNKNOWN_TYPE, 2, "en-US", &labels);
   EXPECT_EQ(ASCIIToUTF16("John Doe, 666 Erebus St."), labels[0]);
   EXPECT_EQ(ASCIIToUTF16("Jane Doe, 123 Letha Shore."), labels[1]);
 
   // Three fields at least - no filter.
-  AutofillProfile::CreateInferredLabels(profiles.get(), NULL, UNKNOWN_TYPE, 3,
-                                        "en-US", &labels);
+  AutofillProfile::CreateInferredLabels(ToRawPointerVector(profiles), NULL,
+                                        UNKNOWN_TYPE, 3, "en-US", &labels);
   EXPECT_EQ(ASCIIToUTF16("John Doe, 666 Erebus St., Elysium"),
             labels[0]);
   EXPECT_EQ(ASCIIToUTF16("Jane Doe, 123 Letha Shore., Dis"),
             labels[1]);
 
   std::vector<ServerFieldType> suggested_fields;
   suggested_fields.push_back(ADDRESS_HOME_CITY);
   suggested_fields.push_back(ADDRESS_HOME_STATE);
   suggested_fields.push_back(ADDRESS_HOME_ZIP);
 
   // Two fields at least, from suggested fields - no filter.
-  AutofillProfile::CreateInferredLabels(profiles.get(), &suggested_fields,
-                                        UNKNOWN_TYPE, 2, "en-US", &labels);
+  AutofillProfile::CreateInferredLabels(ToRawPointerVector(profiles),
+                                        &suggested_fields, UNKNOWN_TYPE, 2,
+                                        "en-US", &labels);
   EXPECT_EQ(ASCIIToUTF16("Elysium 91111"), labels[0]);
   EXPECT_EQ(ASCIIToUTF16("Dis 91222"), labels[1]);
 
   // Three fields at least, from suggested fields - no filter.
-  AutofillProfile::CreateInferredLabels(profiles.get(), &suggested_fields,
-                                        UNKNOWN_TYPE, 3, "en-US", &labels);
+  AutofillProfile::CreateInferredLabels(ToRawPointerVector(profiles),
+                                        &suggested_fields, UNKNOWN_TYPE, 3,
+                                        "en-US", &labels);
   EXPECT_EQ(ASCIIToUTF16("Elysium, CA 91111"), labels[0]);
   EXPECT_EQ(ASCIIToUTF16("Dis, CA 91222"), labels[1]);
 
   // Three fields at least, from suggested fields - but filter reduces available
   // fields to two.
-  AutofillProfile::CreateInferredLabels(profiles.get(), &suggested_fields,
-                                        ADDRESS_HOME_ZIP, 3, "en-US", &labels);
+  AutofillProfile::CreateInferredLabels(ToRawPointerVector(profiles),
+                                        &suggested_fields, ADDRESS_HOME_ZIP, 3,
+                                        "en-US", &labels);
   EXPECT_EQ(ASCIIToUTF16("Elysium, CA"), labels[0]);
   EXPECT_EQ(ASCIIToUTF16("Dis, CA"), labels[1]);
 
   suggested_fields.clear();
   // In our implementation we always display NAME_FULL for all NAME* fields...
   suggested_fields.push_back(NAME_MIDDLE);
   // One field at least, from suggested fields - no filter.
-  AutofillProfile::CreateInferredLabels(profiles.get(), &suggested_fields,
-                                        UNKNOWN_TYPE, 1, "en-US", &labels);
+  AutofillProfile::CreateInferredLabels(ToRawPointerVector(profiles),
+                                        &suggested_fields, UNKNOWN_TYPE, 1,
+                                        "en-US", &labels);
   EXPECT_EQ(ASCIIToUTF16("John Doe"), labels[0]);
   EXPECT_EQ(ASCIIToUTF16("Jane Doe"), labels[1]);
 
   // One field at least, from suggested fields - filter the same as suggested
   // field.
-  AutofillProfile::CreateInferredLabels(profiles.get(), &suggested_fields,
-                                        NAME_MIDDLE, 1, "en-US", &labels);
+  AutofillProfile::CreateInferredLabels(ToRawPointerVector(profiles),
+                                        &suggested_fields, NAME_MIDDLE, 1,
+                                        "en-US", &labels);
   EXPECT_EQ(base::string16(), labels[0]);
   EXPECT_EQ(base::string16(), labels[1]);
 
   suggested_fields.clear();
   // In our implementation we always display NAME_FULL for NAME_MIDDLE_INITIAL
   suggested_fields.push_back(NAME_MIDDLE_INITIAL);
   // One field at least, from suggested fields - no filter.
-  AutofillProfile::CreateInferredLabels(profiles.get(), &suggested_fields,
-                                        UNKNOWN_TYPE, 1, "en-US", &labels);
+  AutofillProfile::CreateInferredLabels(ToRawPointerVector(profiles),
+                                        &suggested_fields, UNKNOWN_TYPE, 1,
+                                        "en-US", &labels);
   EXPECT_EQ(ASCIIToUTF16("John Doe"), labels[0]);
   EXPECT_EQ(ASCIIToUTF16("Jane Doe"), labels[1]);
 
   // One field at least, from suggested fields - filter same as the first non-
   // unknown suggested field.
   suggested_fields.clear();
   suggested_fields.push_back(UNKNOWN_TYPE);
   suggested_fields.push_back(NAME_FULL);
   suggested_fields.push_back(ADDRESS_HOME_LINE1);
-  AutofillProfile::CreateInferredLabels(profiles.get(), &suggested_fields,
-                                        NAME_FULL, 1, "en-US", &labels);
+  AutofillProfile::CreateInferredLabels(ToRawPointerVector(profiles),
+                                        &suggested_fields, NAME_FULL, 1,
+                                        "en-US", &labels);
   EXPECT_EQ(base::string16(ASCIIToUTF16("666 Erebus St.")), labels[0]);
   EXPECT_EQ(base::string16(ASCIIToUTF16("123 Letha Shore.")), labels[1]);
 
   // No suggested fields, but non-unknown excluded field.
-  AutofillProfile::CreateInferredLabels(profiles.get(), NULL,
+  AutofillProfile::CreateInferredLabels(ToRawPointerVector(profiles), NULL,
                                         NAME_FULL, 1, "en-US", &labels);
   EXPECT_EQ(base::string16(ASCIIToUTF16("666 Erebus St.")), labels[0]);
   EXPECT_EQ(base::string16(ASCIIToUTF16("123 Letha Shore.")), labels[1]);
 }
 
 // Test that we fall back to using the full name if there are no other
 // distinguishing fields, but only if it makes sense given the suggested fields.
 TEST(AutofillProfileTest, CreateInferredLabelsFallsBackToFullName) {
-  ScopedVector<AutofillProfile> profiles;
-  profiles.push_back(
-      new AutofillProfile(base::GenerateGUID(), "https://www.example.com/"));
-  test::SetProfileInfo(profiles[0],
-                       "John", "", "Doe", "doe@example.com", "",
-                       "88 Nowhere Ave.", "", "", "", "", "", "");
-  profiles.push_back(
-      new AutofillProfile(base::GenerateGUID(), "https://www.example.com/"));
-  test::SetProfileInfo(profiles[1],
-                       "Johnny", "K", "Doe", "doe@example.com", "",
-                       "88 Nowhere Ave.", "", "", "", "", "", "");
+  std::vector<std::unique_ptr<AutofillProfile>> profiles;
+  profiles.push_back(base::MakeUnique<AutofillProfile>(
+      base::GenerateGUID(), "https://www.example.com/"));
+  test::SetProfileInfo(profiles[0].get(), "John", "", "Doe", "doe@example.com",
+                       "", "88 Nowhere Ave.", "", "", "", "", "", "");
+  profiles.push_back(base::MakeUnique<AutofillProfile>(
+      base::GenerateGUID(), "https://www.example.com/"));
+  test::SetProfileInfo(profiles[1].get(), "Johnny", "K", "Doe",
+                       "doe@example.com", "", "88 Nowhere Ave.", "", "", "", "",
+                       "", "");
 
   // If the only name field in the suggested fields is the excluded field, we
   // should not fall back to the full name as a distinguishing field.
   std::vector<ServerFieldType> suggested_fields;
   suggested_fields.push_back(NAME_LAST);
   suggested_fields.push_back(ADDRESS_HOME_LINE1);
   suggested_fields.push_back(EMAIL_ADDRESS);
   std::vector<base::string16> labels;
-  AutofillProfile::CreateInferredLabels(profiles.get(), &suggested_fields,
-                                        NAME_LAST, 1, "en-US", &labels);
+  AutofillProfile::CreateInferredLabels(ToRawPointerVector(profiles),
+                                        &suggested_fields, NAME_LAST, 1,
+                                        "en-US", &labels);
   ASSERT_EQ(2U, labels.size());
   EXPECT_EQ(ASCIIToUTF16("88 Nowhere Ave."), labels[0]);
   EXPECT_EQ(ASCIIToUTF16("88 Nowhere Ave."), labels[1]);
 
   // Otherwise, we should.
   suggested_fields.push_back(NAME_FIRST);
-  AutofillProfile::CreateInferredLabels(profiles.get(),  &suggested_fields,
-                                        NAME_LAST, 1, "en-US", &labels);
+  AutofillProfile::CreateInferredLabels(ToRawPointerVector(profiles),
+                                        &suggested_fields, NAME_LAST, 1,
+                                        "en-US", &labels);
   ASSERT_EQ(2U, labels.size());
   EXPECT_EQ(ASCIIToUTF16("88 Nowhere Ave., John Doe"), labels[0]);
   EXPECT_EQ(ASCIIToUTF16("88 Nowhere Ave., Johnny K Doe"), labels[1]);
 }
 
 // Test that we do not show duplicate fields in the labels.
 TEST(AutofillProfileTest, CreateInferredLabelsNoDuplicatedFields) {
-  ScopedVector<AutofillProfile> profiles;
-  profiles.push_back(
-      new AutofillProfile(base::GenerateGUID(), "https://www.example.com/"));
-  test::SetProfileInfo(profiles[0],
-                       "John", "", "Doe", "doe@example.com", "",
-                       "88 Nowhere Ave.", "", "", "", "", "", "");
-  profiles.push_back(
-      new AutofillProfile(base::GenerateGUID(), "https://www.example.com/"));
-  test::SetProfileInfo(profiles[1],
-                       "John", "", "Doe", "dojo@example.com", "",
-                       "88 Nowhere Ave.", "", "", "", "", "", "");
+  std::vector<std::unique_ptr<AutofillProfile>> profiles;
+  profiles.push_back(base::MakeUnique<AutofillProfile>(
+      base::GenerateGUID(), "https://www.example.com/"));
+  test::SetProfileInfo(profiles[0].get(), "John", "", "Doe", "doe@example.com",
+                       "", "88 Nowhere Ave.", "", "", "", "", "", "");
+  profiles.push_back(base::MakeUnique<AutofillProfile>(
+      base::GenerateGUID(), "https://www.example.com/"));
+  test::SetProfileInfo(profiles[1].get(), "John", "", "Doe", "dojo@example.com",
+                       "", "88 Nowhere Ave.", "", "", "", "", "", "");
 
   // If the only name field in the suggested fields is the excluded field, we
   // should not fall back to the full name as a distinguishing field.
   std::vector<ServerFieldType> suggested_fields;
   suggested_fields.push_back(ADDRESS_HOME_LINE1);
   suggested_fields.push_back(ADDRESS_BILLING_LINE1);
   suggested_fields.push_back(EMAIL_ADDRESS);
   std::vector<base::string16> labels;
-  AutofillProfile::CreateInferredLabels(profiles.get(), &suggested_fields,
-                                        UNKNOWN_TYPE, 2, "en-US", &labels);
+  AutofillProfile::CreateInferredLabels(ToRawPointerVector(profiles),
+                                        &suggested_fields, UNKNOWN_TYPE, 2,
+                                        "en-US", &labels);
   ASSERT_EQ(2U, labels.size());
   EXPECT_EQ(ASCIIToUTF16("88 Nowhere Ave., doe@example.com"), labels[0]);
   EXPECT_EQ(ASCIIToUTF16("88 Nowhere Ave., dojo@example.com"), labels[1]);
 }
 
 // Make sure that empty fields are not treated as distinguishing fields.
 TEST(AutofillProfileTest, CreateInferredLabelsSkipsEmptyFields) {
-  ScopedVector<AutofillProfile> profiles;
-  profiles.push_back(
-      new AutofillProfile(base::GenerateGUID(), "https://www.example.com/"));
-  test::SetProfileInfo(profiles[0],
-                       "John", "", "Doe", "doe@example.com",
+  std::vector<std::unique_ptr<AutofillProfile>> profiles;
+  profiles.push_back(base::MakeUnique<AutofillProfile>(
+      base::GenerateGUID(), "https://www.example.com/"));
+  test::SetProfileInfo(profiles[0].get(), "John", "", "Doe", "doe@example.com",
                        "Gogole", "", "", "", "", "", "", "");
-  profiles.push_back(
-      new AutofillProfile(base::GenerateGUID(), "https://www.example.com/"));
-  test::SetProfileInfo(profiles[1],
-                       "John", "", "Doe", "doe@example.com",
+  profiles.push_back(base::MakeUnique<AutofillProfile>(
+      base::GenerateGUID(), "https://www.example.com/"));
+  test::SetProfileInfo(profiles[1].get(), "John", "", "Doe", "doe@example.com",
                        "Ggoole", "", "", "", "", "", "", "");
-  profiles.push_back(
-      new AutofillProfile(base::GenerateGUID(), "https://www.example.com/"));
-  test::SetProfileInfo(profiles[2],
-                       "John", "", "Doe", "john.doe@example.com",
-                       "Goolge", "", "", "", "", "", "", "");
+  profiles.push_back(base::MakeUnique<AutofillProfile>(
+      base::GenerateGUID(), "https://www.example.com/"));
+  test::SetProfileInfo(profiles[2].get(), "John", "", "Doe",
+                       "john.doe@example.com", "Goolge", "", "", "", "", "", "",
+                       "");
 
   std::vector<base::string16> labels;
-  AutofillProfile::CreateInferredLabels(profiles.get(), NULL, UNKNOWN_TYPE, 3,
-                                        "en-US", &labels);
+  AutofillProfile::CreateInferredLabels(ToRawPointerVector(profiles), NULL,
+                                        UNKNOWN_TYPE, 3, "en-US", &labels);
   ASSERT_EQ(3U, labels.size());
   EXPECT_EQ(ASCIIToUTF16("John Doe, doe@example.com, Gogole"), labels[0]);
   EXPECT_EQ(ASCIIToUTF16("John Doe, doe@example.com, Ggoole"), labels[1]);
   EXPECT_EQ(ASCIIToUTF16("John Doe, john.doe@example.com, Goolge"), labels[2]);
 
   // A field must have a non-empty value for each profile to be considered a
   // distinguishing field.
   profiles[1]->SetRawInfo(ADDRESS_HOME_LINE1, ASCIIToUTF16("88 Nowhere Ave."));
-  AutofillProfile::CreateInferredLabels(profiles.get(), NULL, UNKNOWN_TYPE, 1,
-                                        "en-US", &labels);
+  AutofillProfile::CreateInferredLabels(ToRawPointerVector(profiles), NULL,
+                                        UNKNOWN_TYPE, 1, "en-US", &labels);
   ASSERT_EQ(3U, labels.size());
   EXPECT_EQ(ASCIIToUTF16("John Doe, doe@example.com, Gogole"), labels[0]);
   EXPECT_EQ(ASCIIToUTF16("John Doe, 88 Nowhere Ave., doe@example.com, Ggoole"),
             labels[1]) << labels[1];
   EXPECT_EQ(ASCIIToUTF16("John Doe, john.doe@example.com"), labels[2]);
 }
 
 // Test that labels that would otherwise have multiline values are flattened.
 TEST(AutofillProfileTest, CreateInferredLabelsFlattensMultiLineValues) {
-  ScopedVector<AutofillProfile> profiles;
-  profiles.push_back(
-      new AutofillProfile(base::GenerateGUID(), "https://www.example.com/"));
-  test::SetProfileInfo(profiles[0],
-                       "John", "", "Doe", "doe@example.com", "",
-                       "88 Nowhere Ave.", "Apt. 42", "", "", "", "", "");
+  std::vector<std::unique_ptr<AutofillProfile>> profiles;
+  profiles.push_back(base::MakeUnique<AutofillProfile>(
+      base::GenerateGUID(), "https://www.example.com/"));
+  test::SetProfileInfo(profiles[0].get(), "John", "", "Doe", "doe@example.com",
+                       "", "88 Nowhere Ave.", "Apt. 42", "", "", "", "", "");
 
   // If the only name field in the suggested fields is the excluded field, we
   // should not fall back to the full name as a distinguishing field.
   std::vector<ServerFieldType> suggested_fields;
   suggested_fields.push_back(NAME_FULL);
   suggested_fields.push_back(ADDRESS_HOME_STREET_ADDRESS);
   std::vector<base::string16> labels;
-  AutofillProfile::CreateInferredLabels(profiles.get(), &suggested_fields,
-                                        NAME_FULL, 1, "en-US", &labels);
+  AutofillProfile::CreateInferredLabels(ToRawPointerVector(profiles),
+                                        &suggested_fields, NAME_FULL, 1,
+                                        "en-US", &labels);
   ASSERT_EQ(1U, labels.size());
   EXPECT_EQ(ASCIIToUTF16("88 Nowhere Ave., Apt. 42"), labels[0]);
 }
 
 TEST(AutofillProfileTest, IsSubsetOf) {
   std::unique_ptr<AutofillProfile> a, b;
 
   // |a| is a subset of |b|.
   a.reset(
       new AutofillProfile(base::GenerateGUID(), "https://www.example.com/"));
@@ skipping 410 matching lines @@
   // The first, middle and last names should be kept and name full should be
   // added.
   EXPECT_EQ(base::ASCIIToUTF16("Marion"), a.GetRawInfo(NAME_FIRST));
   EXPECT_EQ(base::ASCIIToUTF16("Mitchell"), a.GetRawInfo(NAME_MIDDLE));
   EXPECT_EQ(base::ASCIIToUTF16("Morrison"), a.GetRawInfo(NAME_LAST));
   EXPECT_EQ(base::ASCIIToUTF16("Marion Mitchell Morrison"),
             a.GetRawInfo(NAME_FULL));
 }
 
 }  // namespace autofill