Autofill extend profiles to include multi-valued fields, part 2.

chrome/browser/autofill/autofill_profile_unittest.cc

 // Copyright (c) 2011 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 "base/basictypes.h"
 #include "base/scoped_ptr.h"
 #include "base/scoped_vector.h"
 #include "base/stl_util-inl.h"
 #include "base/string16.h"
 #include "base/utf_string_conversions.h"
@@ skipping 585 matching lines @@
                                 "Hollywood", "CA", "91601", "US", "12345678910",
                                 "01987654321");
   b = a;
   EXPECT_TRUE(a == b);
 
   // Assignment to self should not change the profile value.
   a = a;
   EXPECT_TRUE(a == b);
 }
 
-TEST(AutoFillProfileTest, Clone) {
+TEST(AutoFillProfileTest, Copy) {
   AutoFillProfile a;
 
   // Clone should be logically equal to the original.
   autofill_test::SetProfileInfo(&a, "Marion", "Mitchell", "Morrison",
                                 "marion@me.xyz", "Fox", "123 Zoo St.", "unit 5",
                                 "Hollywood", "CA", "91601", "US", "12345678910",
                                 "01987654321");
-  scoped_ptr<AutoFillProfile> b(static_cast<AutoFillProfile*>(a.Clone()));
-  EXPECT_TRUE(a == *b);
+  AutoFillProfile b(a);
+  EXPECT_TRUE(a == b);
 }
 
 TEST(AutoFillProfileTest, Compare) {
   AutoFillProfile a, b;
 
   // Empty profiles are the same.
   EXPECT_EQ(0, a.Compare(b));
 
   // GUIDs don't count.
   a.set_guid(guid::GenerateGUID());
   b.set_guid(guid::GenerateGUID());
   EXPECT_EQ(0, a.Compare(b));
 
   // Different values produce non-zero results.
   autofill_test::SetProfileInfo(&a, "Jimmy", NULL, NULL, NULL,
       NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
   autofill_test::SetProfileInfo(&b, "Ringo", NULL, NULL, NULL,
       NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
   EXPECT_GT(0, a.Compare(b));
   EXPECT_LT(0, b.Compare(a));
 }
 
 TEST(AutoFillProfileTest, CountryCode) {
   AutoFillProfile profile;
   EXPECT_EQ(std::string(), profile.CountryCode());
 
   profile.SetCountryCode("US");
   EXPECT_EQ("US", profile.CountryCode());
 }