Don't wrap string16() around ASCIIToUTF16()

chrome/browser/autofill/autofill_profile_unittest.cc

 // Copyright (c) 2010 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/stl_util-inl.h"
 #include "base/string16.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autofill/autofill_common_test.h"
@@ skipping 21 matching lines @@
   EXPECT_EQ(string16(), summary0);
 
   // Case 0a/empty name and address, so the first two fields of the rest of the
   // data is used: "Hollywood, CA"
   AutoFillProfile profile00;
   autofill_test::SetProfileInfo(&profile00, "Billing", "", "Mitchell", "",
       "johnwayne@me.xyz", "Fox", "", "unit 5", "Hollywood", "CA", "91601", "US",
       "12345678910", "01987654321");
   EXPECT_TRUE(UpdateProfileLabel(&profile00));
   string16 summary00 = profile00.Label();
-  EXPECT_EQ(string16(ASCIIToUTF16("Hollywood, CA")), summary00);
+  EXPECT_EQ(ASCIIToUTF16("Hollywood, CA"), summary00);
 
   // Case 1: "<address>"
   AutoFillProfile profile1;
   autofill_test::SetProfileInfo(&profile1, "Billing", "", "Mitchell", "",
       "johnwayne@me.xyz", "Fox", "123 Zoo St.", "unit 5", "Hollywood", "CA",
       "91601", "US", "12345678910", "01987654321");
   EXPECT_TRUE(UpdateProfileLabel(&profile1));
   string16 summary1 = profile1.Label();
-  EXPECT_EQ(string16(ASCIIToUTF16("123 Zoo St., Hollywood")), summary1);
+  EXPECT_EQ(ASCIIToUTF16("123 Zoo St., Hollywood"), summary1);
 
   // Case 2: "<lastname>"
   AutoFillProfile profile2;
   autofill_test::SetProfileInfo(&profile2, "Billing", "", "Mitchell",
       "Morrison", "johnwayne@me.xyz", "Fox", "", "unit 5", "Hollywood", "CA",
       "91601", "US", "12345678910", "01987654321");
   EXPECT_TRUE(UpdateProfileLabel(&profile2));
   string16 summary2 = profile2.Label();
   // Summary does include full name which is empty if the first name is empty.
-  EXPECT_EQ(string16(ASCIIToUTF16("Hollywood, CA")), summary2);
+  EXPECT_EQ(ASCIIToUTF16("Hollywood, CA"), summary2);
 
   // Case 3: "<lastname>, <address>"
   AutoFillProfile profile3;
   autofill_test::SetProfileInfo(&profile3, "Billing", "", "Mitchell",
       "Morrison", "johnwayne@me.xyz", "Fox", "123 Zoo St.", "unit 5",
       "Hollywood", "CA", "91601", "US", "12345678910", "01987654321");
   EXPECT_TRUE(UpdateProfileLabel(&profile3));
   string16 summary3 = profile3.Label();
-  EXPECT_EQ(string16(ASCIIToUTF16("123 Zoo St., Hollywood")), summary3);
+  EXPECT_EQ(ASCIIToUTF16("123 Zoo St., Hollywood"), summary3);
 
   // Case 4: "<firstname>"
   AutoFillProfile profile4;
   autofill_test::SetProfileInfo(&profile4, "Billing", "Marion", "Mitchell", "",
       "johnwayne@me.xyz", "Fox", "", "unit 5", "Hollywood", "CA", "91601", "US",
       "12345678910", "01987654321");
   EXPECT_TRUE(UpdateProfileLabel(&profile4));
   string16 summary4 = profile4.Label();
-  EXPECT_EQ(string16(ASCIIToUTF16("Marion Mitchell, Hollywood")), summary4);
+  EXPECT_EQ(ASCIIToUTF16("Marion Mitchell, Hollywood"), summary4);
 
   // Case 5: "<firstname>, <address>"
   AutoFillProfile profile5;
   autofill_test::SetProfileInfo(&profile5, "Billing", "Marion", "Mitchell", "",
       "johnwayne@me.xyz", "Fox", "123 Zoo St.", "unit 5", "Hollywood", "CA",
       "91601", "US", "12345678910", "01987654321");
   EXPECT_TRUE(UpdateProfileLabel(&profile5));
   string16 summary5 = profile5.Label();
-  EXPECT_EQ(string16(ASCIIToUTF16("Marion Mitchell, 123 Zoo St.")), summary5);
+  EXPECT_EQ(ASCIIToUTF16("Marion Mitchell, 123 Zoo St."), summary5);
 
   // Case 6: "<firstname> <lastname>"
   AutoFillProfile profile6;
   autofill_test::SetProfileInfo(&profile6, "Billing", "Marion", "Mitchell",
       "Morrison", "johnwayne@me.xyz", "Fox", "", "unit 5", "Hollywood", "CA",
       "91601", "US", "12345678910", "01987654321");
   EXPECT_TRUE(UpdateProfileLabel(&profile6));
   string16 summary6 = profile6.Label();
-  EXPECT_EQ(string16(ASCIIToUTF16("Marion Mitchell Morrison, Hollywood")),
+  EXPECT_EQ(ASCIIToUTF16("Marion Mitchell Morrison, Hollywood"),
             summary6);
 
   // Case 7: "<firstname> <lastname>, <address>"
   AutoFillProfile profile7;
   autofill_test::SetProfileInfo(&profile7, "Billing", "Marion", "Mitchell",
       "Morrison", "johnwayne@me.xyz", "Fox", "123 Zoo St.", "unit 5",
       "Hollywood", "CA", "91601", "US", "12345678910", "01987654321");
   EXPECT_TRUE(UpdateProfileLabel(&profile7));
   string16 summary7 = profile7.Label();
-  EXPECT_EQ(string16(ASCIIToUTF16("Marion Mitchell Morrison, 123 Zoo St.")),
+  EXPECT_EQ(ASCIIToUTF16("Marion Mitchell Morrison, 123 Zoo St."),
             summary7);
 
   // Case 7a: "<firstname> <lastname>, <address>" - same as #7, except for
   // e-mail.
   AutoFillProfile profile7a;
   autofill_test::SetProfileInfo(&profile7a, "Billing", "Marion", "Mitchell",
     "Morrison", "marion@me.xyz", "Fox", "123 Zoo St.", "unit 5",
     "Hollywood", "CA", "91601", "US", "12345678910", "01987654321");
   std::vector<AutoFillProfile*> profiles;
   profiles.push_back(&profile7);
   profiles.push_back(&profile7a);
   EXPECT_TRUE(AutoFillProfile::AdjustInferredLabels(&profiles));
   summary7 = profile7.Label();
   string16 summary7a = profile7a.Label();
-  EXPECT_EQ(string16(ASCIIToUTF16(
-      "Marion Mitchell Morrison, 123 Zoo St., johnwayne@me.xyz")), summary7);
-  EXPECT_EQ(string16(ASCIIToUTF16(
-      "Marion Mitchell Morrison, 123 Zoo St., marion@me.xyz")), summary7a);
+  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) {
   std::vector<AutoFillProfile*> profiles;
   profiles.push_back(new AutoFillProfile);
   autofill_test::SetProfileInfo(
       profiles[0],
       "",
       "John",
       "",
@@ skipping 20 matching lines @@
       "",
       "Dis", "CA",
       "91222",
       "US",
       "12345678910",
       "01987654321");
   // As labels are empty they are adjusted the first time.
   EXPECT_TRUE(AutoFillProfile::AdjustInferredLabels(&profiles));
   // No need to adjust them anymore.
   EXPECT_FALSE(AutoFillProfile::AdjustInferredLabels(&profiles));
-  EXPECT_EQ(string16(ASCIIToUTF16("John Doe, 666 Erebus St.")),
+  EXPECT_EQ(ASCIIToUTF16("John Doe, 666 Erebus St."),
             profiles[0]->Label());
-  EXPECT_EQ(string16(ASCIIToUTF16("Jane Doe, 123 Letha Shore.")),
+  EXPECT_EQ(ASCIIToUTF16("Jane Doe, 123 Letha Shore."),
             profiles[1]->Label());
 
   profiles.push_back(new AutoFillProfile);
   autofill_test::SetProfileInfo(
       profiles[2],
       "",
       "John",
       "",
       "Doe",
       "johndoe@tertium.com",
       "Underworld",
       "666 Erebus St.",
       "",
       "Elysium", "CA",
       "91111",
       "US",
       "11111111111",
       "22222222222");
   EXPECT_TRUE(AutoFillProfile::AdjustInferredLabels(&profiles));
 
   // Profile 0 and 2 inferred label now includes an e-mail.
-  EXPECT_EQ(string16(
-            ASCIIToUTF16("John Doe, 666 Erebus St., johndoe@hades.com")),
+  EXPECT_EQ(ASCIIToUTF16("John Doe, 666 Erebus St., johndoe@hades.com"),
             profiles[0]->Label());
-  EXPECT_EQ(string16(ASCIIToUTF16("Jane Doe, 123 Letha Shore.")),
+  EXPECT_EQ(ASCIIToUTF16("Jane Doe, 123 Letha Shore."),
             profiles[1]->Label());
-  EXPECT_EQ(string16(
-            ASCIIToUTF16("John Doe, 666 Erebus St., johndoe@tertium.com")),
+  EXPECT_EQ(ASCIIToUTF16("John Doe, 666 Erebus St., johndoe@tertium.com"),
             profiles[2]->Label());
 
   delete profiles[2];
   profiles.pop_back();
 
   profiles.push_back(new AutoFillProfile);
   autofill_test::SetProfileInfo(
       profiles[2],
       "",
       "John",
       "",
       "Doe",
       "johndoe@hades.com",
       "Underworld",
       "666 Erebus St.",
       "",
       "Elysium", "CA",
       "91111",
       "US",
       "11111111111",
       "33333333333");  // Fax is different
 
   EXPECT_TRUE(AutoFillProfile::AdjustInferredLabels(&profiles));
 
   // Profile 0 and 2 inferred label now includes a fax number.
-  EXPECT_EQ(string16(ASCIIToUTF16(
-            "John Doe, 666 Erebus St., fax:#22222222222")),
+  EXPECT_EQ(ASCIIToUTF16("John Doe, 666 Erebus St., fax:#22222222222"),
             profiles[0]->Label());
-  EXPECT_EQ(string16(ASCIIToUTF16("Jane Doe, 123 Letha Shore.")),
+  EXPECT_EQ(ASCIIToUTF16("Jane Doe, 123 Letha Shore."),
             profiles[1]->Label());
-  EXPECT_EQ(string16(ASCIIToUTF16(
-            "John Doe, 666 Erebus St., fax:#33333333333")),
+  EXPECT_EQ(ASCIIToUTF16("John Doe, 666 Erebus St., fax:#33333333333"),
             profiles[2]->Label());
 
   profiles.push_back(new AutoFillProfile);
   autofill_test::SetProfileInfo(
       profiles[3],
       "",
       "John",
       "",
       "Doe",
       "johndoe@hades.com",
       "Underworld",
       "666 Erebus St.",
       "",
       "Elysium", "CA",
       "91111",
       "US",
       "44444444444",  // Phone is different for some.
       "33333333333");  // Fax is different for some.
 
   EXPECT_TRUE(AutoFillProfile::AdjustInferredLabels(&profiles));
 
-  EXPECT_EQ(string16(ASCIIToUTF16("John Doe, 666 Erebus St., 11111111111,"
-                                  " fax:#22222222222")),
+  EXPECT_EQ(ASCIIToUTF16("John Doe, 666 Erebus St., 11111111111,"
+                         " fax:#22222222222"),
             profiles[0]->Label());
-  EXPECT_EQ(string16(ASCIIToUTF16("Jane Doe, 123 Letha Shore.")),
+  EXPECT_EQ(ASCIIToUTF16("Jane Doe, 123 Letha Shore."),
             profiles[1]->Label());
-  EXPECT_EQ(string16(ASCIIToUTF16("John Doe, 666 Erebus St., 11111111111,"
-                                  " fax:#33333333333")),
+  EXPECT_EQ(ASCIIToUTF16("John Doe, 666 Erebus St., 11111111111,"
+                         " fax:#33333333333"),
             profiles[2]->Label());
   // This one differs from other ones by unique phone, so no need for extra
   // information.
-  EXPECT_EQ(string16(ASCIIToUTF16("John Doe, 666 Erebus St., 44444444444")),
+  EXPECT_EQ(ASCIIToUTF16("John Doe, 666 Erebus St., 44444444444"),
             profiles[3]->Label());
 
   profiles.push_back(new AutoFillProfile);
   autofill_test::SetProfileInfo(
       profiles[4],
       "",
       "John",
       "",
       "Doe",
       "johndoe@styx.com",  // E-Mail is different for some.
       "Underworld",
       "666 Erebus St.",
       "",
       "Elysium", "CA",
       "91111",
       "US",
       "44444444444",  // Phone is different for some.
       "33333333333");  // Fax is different for some.
 
   EXPECT_TRUE(AutoFillProfile::AdjustInferredLabels(&profiles));
 
-  EXPECT_EQ(string16(ASCIIToUTF16(
-      "John Doe, 666 Erebus St., johndoe@hades.com,"
-      " 11111111111, fax:#22222222222")),
-      profiles[0]->Label());
-  EXPECT_EQ(string16(ASCIIToUTF16("Jane Doe, 123 Letha Shore.")),
+  EXPECT_EQ(ASCIIToUTF16("John Doe, 666 Erebus St., johndoe@hades.com,"
+                         " 11111111111, fax:#22222222222"),
+            profiles[0]->Label());
+  EXPECT_EQ(ASCIIToUTF16("Jane Doe, 123 Letha Shore."),
             profiles[1]->Label());
-  EXPECT_EQ(string16(ASCIIToUTF16(
-      "John Doe, 666 Erebus St., johndoe@hades.com,"
-      " 11111111111, fax:#33333333333")),
-      profiles[2]->Label());
-  EXPECT_EQ(string16(ASCIIToUTF16(
-      "John Doe, 666 Erebus St., johndoe@hades.com,"
-      " 44444444444, fax:#33333333333")),
-      profiles[3]->Label());
+  EXPECT_EQ(ASCIIToUTF16("John Doe, 666 Erebus St., johndoe@hades.com,"
+                         " 11111111111, fax:#33333333333"),
+            profiles[2]->Label());
+  EXPECT_EQ(ASCIIToUTF16("John Doe, 666 Erebus St., johndoe@hades.com,"
+                         " 44444444444, fax:#33333333333"),
+            profiles[3]->Label());
   // This one differs from other ones by unique e-mail, so no need for extra
   // information.
-  EXPECT_EQ(string16(ASCIIToUTF16(
-      "John Doe, 666 Erebus St., johndoe@styx.com")),
-      profiles[4]->Label());
+  EXPECT_EQ(ASCIIToUTF16("John Doe, 666 Erebus St., johndoe@styx.com"),
+            profiles[4]->Label());
 
   EXPECT_FALSE(AutoFillProfile::AdjustInferredLabels(&profiles));
 
   // Clean up.
   STLDeleteContainerPointers(profiles.begin(), profiles.end());
 }
 
 TEST(AutoFillProfileTest, CreateInferredLabels) {
   std::vector<AutoFillProfile*> profiles;
   profiles.push_back(new AutoFillProfile);
@@ skipping 23 matching lines @@
                                 "",
                                 "Dis", "CA",
                                 "91222",
                                 "US",
                                 "12345678910",
                                 "01987654321");
   std::vector<string16> labels;
   // Two fields at least - no filter.
   AutoFillProfile::CreateInferredLabels(&profiles, &labels, 2, UNKNOWN_TYPE,
                                         NULL);
-  EXPECT_EQ(string16(ASCIIToUTF16("John Doe, 666 Erebus St.")), labels[0]);
-  EXPECT_EQ(string16(ASCIIToUTF16("Jane Doe, 123 Letha Shore.")), labels[1]);
+  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, &labels, 3, UNKNOWN_TYPE,
                                         NULL);
-  EXPECT_EQ(string16(ASCIIToUTF16("John Doe, 666 Erebus St., Elysium")),
+  EXPECT_EQ(ASCIIToUTF16("John Doe, 666 Erebus St., Elysium"),
             labels[0]);
-  EXPECT_EQ(string16(ASCIIToUTF16("Jane Doe, 123 Letha Shore., Dis")),
+  EXPECT_EQ(ASCIIToUTF16("Jane Doe, 123 Letha Shore., Dis"),
             labels[1]);
 
   // Two fields at least - filter out the name.
   AutoFillProfile::CreateInferredLabels(&profiles, &labels, 2, NAME_FULL, NULL);
-  EXPECT_EQ(string16(ASCIIToUTF16("666 Erebus St., Elysium")), labels[0]);
-  EXPECT_EQ(string16(ASCIIToUTF16("123 Letha Shore., Dis")), labels[1]);
+  EXPECT_EQ(ASCIIToUTF16("666 Erebus St., Elysium"), labels[0]);
+  EXPECT_EQ(ASCIIToUTF16("123 Letha Shore., Dis"), labels[1]);
 
   std::vector<AutoFillFieldType> 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, &labels, 2, UNKNOWN_TYPE,
                                         &suggested_fields);
-  EXPECT_EQ(string16(ASCIIToUTF16("Elysium, CA")), labels[0]);
-  EXPECT_EQ(string16(ASCIIToUTF16("Dis, CA")), labels[1]);
+  EXPECT_EQ(ASCIIToUTF16("Elysium, CA"), labels[0]);
+  EXPECT_EQ(ASCIIToUTF16("Dis, CA"), labels[1]);
 
   // Three fields at least, from suggested fields - no filter.
   AutoFillProfile::CreateInferredLabels(&profiles, &labels, 3, UNKNOWN_TYPE,
                                         &suggested_fields);
-  EXPECT_EQ(string16(ASCIIToUTF16("Elysium, CA, 91111")), labels[0]);
-  EXPECT_EQ(string16(ASCIIToUTF16("Dis, CA, 91222")), labels[1]);
+  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, &labels, 3,
                                         ADDRESS_HOME_STATE, &suggested_fields);
-  EXPECT_EQ(string16(ASCIIToUTF16("Elysium, 91111")), labels[0]);
-  EXPECT_EQ(string16(ASCIIToUTF16("Dis, 91222")), labels[1]);
+  EXPECT_EQ(ASCIIToUTF16("Elysium, 91111"), labels[0]);
+  EXPECT_EQ(ASCIIToUTF16("Dis, 91222"), 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, &labels, 1, UNKNOWN_TYPE,
                                         &suggested_fields);
-  EXPECT_EQ(string16(ASCIIToUTF16("John Doe")), labels[0]);
-  EXPECT_EQ(string16(ASCIIToUTF16("Jane Doe")), labels[1]);
+  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, &labels, 1, NAME_MIDDLE,
                                         &suggested_fields);
-  EXPECT_EQ(string16(ASCIIToUTF16("")), labels[0]);
-  EXPECT_EQ(string16(ASCIIToUTF16("")), labels[1]);
+  EXPECT_EQ(string16(), labels[0]);
+  EXPECT_EQ(string16(), labels[1]);
   // Clean up.
   STLDeleteContainerPointers(profiles.begin(), profiles.end());
 }
 
 TEST(AutoFillProfileTest, IsSubsetOf) {
   scoped_ptr<AutoFillProfile> a, b;
 
   // |a| is a subset of |b|.
   a.reset(new AutoFillProfile);
   b.reset(new AutoFillProfile);
@@ skipping 128 matching lines @@
   // Different values produce non-zero results.
   autofill_test::SetProfileInfo(&a, "label1", "Jimmy", NULL, NULL, NULL,
       NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
   autofill_test::SetProfileInfo(&b, "label1", "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));
 }
 
 }  // namespace