Convert string16 -> base::string16 in components/

components/autofill/browser/credit_card_unittest.cc

Index: components/autofill/browser/credit_card_unittest.cc
diff --git a/components/autofill/browser/credit_card_unittest.cc b/components/autofill/browser/credit_card_unittest.cc
index fb98e2b364ab5e758cb771685cee152179bb7c32..636b0132b7fd8a59a6527f2006b357676be1d584 100644
--- a/components/autofill/browser/credit_card_unittest.cc
+++ b/components/autofill/browser/credit_card_unittest.cc
@@ -46,54 +46,54 @@ const char* const kInvalidNumbers[] = {
 TEST(CreditCardTest, PreviewSummaryAndObfuscatedNumberStrings) {
   // Case 0: empty credit card.
   CreditCard credit_card0;
-  string16 summary0 = credit_card0.Label();
-  EXPECT_EQ(string16(), summary0);
-  string16 obfuscated0 = credit_card0.ObfuscatedNumber();
-  EXPECT_EQ(string16(), obfuscated0);
+  base::string16 summary0 = credit_card0.Label();
+  EXPECT_EQ(base::string16(), summary0);
+  base::string16 obfuscated0 = credit_card0.ObfuscatedNumber();
+  EXPECT_EQ(base::string16(), obfuscated0);
 
   // Case 00: Empty credit card with empty strings.
   CreditCard credit_card00;
   autofill_test::SetCreditCardInfo(&credit_card00,
       "John Dillinger", "", "", "");
-  string16 summary00 = credit_card00.Label();
-  EXPECT_EQ(string16(ASCIIToUTF16("John Dillinger")), summary00);
-  string16 obfuscated00 = credit_card00.ObfuscatedNumber();
-  EXPECT_EQ(string16(), obfuscated00);
+  base::string16 summary00 = credit_card00.Label();
+  EXPECT_EQ(base::string16(ASCIIToUTF16("John Dillinger")), summary00);
+  base::string16 obfuscated00 = credit_card00.ObfuscatedNumber();
+  EXPECT_EQ(base::string16(), obfuscated00);
 
   // Case 1: No credit card number.
   CreditCard credit_card1;
   autofill_test::SetCreditCardInfo(&credit_card1,
       "John Dillinger", "", "01", "2010");
-  string16 summary1 = credit_card1.Label();
-  EXPECT_EQ(string16(ASCIIToUTF16("John Dillinger")), summary1);
-  string16 obfuscated1 = credit_card1.ObfuscatedNumber();
-  EXPECT_EQ(string16(), obfuscated1);
+  base::string16 summary1 = credit_card1.Label();
+  EXPECT_EQ(base::string16(ASCIIToUTF16("John Dillinger")), summary1);
+  base::string16 obfuscated1 = credit_card1.ObfuscatedNumber();
+  EXPECT_EQ(base::string16(), obfuscated1);
 
   // Case 2: No month.
   CreditCard credit_card2;
   autofill_test::SetCreditCardInfo(&credit_card2,
       "John Dillinger", "5105 1051 0510 5100", "", "2010");
-  string16 summary2 = credit_card2.Label();
+  base::string16 summary2 = credit_card2.Label();
   EXPECT_EQ(ASCIIToUTF16("************5100"), summary2);
-  string16 obfuscated2 = credit_card2.ObfuscatedNumber();
+  base::string16 obfuscated2 = credit_card2.ObfuscatedNumber();
   EXPECT_EQ(ASCIIToUTF16("************5100"), obfuscated2);
 
   // Case 3: No year.
   CreditCard credit_card3;
   autofill_test::SetCreditCardInfo(&credit_card3,
       "John Dillinger", "5105 1051 0510 5100", "01", "");
-  string16 summary3 = credit_card3.Label();
+  base::string16 summary3 = credit_card3.Label();
   EXPECT_EQ(ASCIIToUTF16("************5100"), summary3);
-  string16 obfuscated3 = credit_card3.ObfuscatedNumber();
+  base::string16 obfuscated3 = credit_card3.ObfuscatedNumber();
   EXPECT_EQ(ASCIIToUTF16("************5100"), obfuscated3);
 
   // Case 4: Have everything.
   CreditCard credit_card4;
   autofill_test::SetCreditCardInfo(&credit_card4,
       "John Dillinger", "5105 1051 0510 5100", "01", "2010");
-  string16 summary4 = credit_card4.Label();
+  base::string16 summary4 = credit_card4.Label();
   EXPECT_EQ(ASCIIToUTF16("************5100, Exp: 01/2010"), summary4);
-  string16 obfuscated4 = credit_card4.ObfuscatedNumber();
+  base::string16 obfuscated4 = credit_card4.ObfuscatedNumber();
   EXPECT_EQ(ASCIIToUTF16("************5100"), obfuscated4);
 
   // Case 5: Very long credit card
@@ -101,9 +101,9 @@ TEST(CreditCardTest, PreviewSummaryAndObfuscatedNumberStrings) {
   autofill_test::SetCreditCardInfo(&credit_card5,
       "John Dillinger",
       "0123456789 0123456789 0123456789 5105 1051 0510 5100", "01", "2010");
-  string16 summary5 = credit_card5.Label();
+  base::string16 summary5 = credit_card5.Label();
   EXPECT_EQ(ASCIIToUTF16("********************5100, Exp: 01/2010"), summary5);
-  string16 obfuscated5 = credit_card5.ObfuscatedNumber();
+  base::string16 obfuscated5 = credit_card5.ObfuscatedNumber();
   EXPECT_EQ(ASCIIToUTF16("********************5100"), obfuscated5);
 }
 
@@ -191,7 +191,7 @@ TEST(CreditCardTest, CreditCardType) {
 
   // The card type cannot be set directly.
   card.SetRawInfo(CREDIT_CARD_TYPE, ASCIIToUTF16("Visa"));
-  EXPECT_EQ(string16(), card.GetRawInfo(CREDIT_CARD_TYPE));
+  EXPECT_EQ(base::string16(), card.GetRawInfo(CREDIT_CARD_TYPE));
 
   // Setting the number should implicitly set the type.
   card.SetRawInfo(CREDIT_CARD_NUMBER, ASCIIToUTF16("4111 1111 1111 1111"));
@@ -203,7 +203,7 @@ TEST(CreditCardTest, CreditCardVerificationCode) {
 
   // The verification code cannot be set, as Chrome does not store this data.
   card.SetRawInfo(CREDIT_CARD_VERIFICATION_CODE, ASCIIToUTF16("999"));
-  EXPECT_EQ(string16(), card.GetRawInfo(CREDIT_CARD_VERIFICATION_CODE));
+  EXPECT_EQ(base::string16(), card.GetRawInfo(CREDIT_CARD_VERIFICATION_CODE));
 }
 
 
@@ -211,7 +211,7 @@ TEST(CreditCardTest, CreditCardMonthExact) {
   const char* const kMonthsNumeric[] = {
     "01", "02", "03", "04", "05", "06", "07", "08", "09", "10", "11", "12",
   };
-  std::vector<string16> options(arraysize(kMonthsNumeric));
+  std::vector<base::string16> options(arraysize(kMonthsNumeric));
   for (size_t i = 0; i < arraysize(kMonthsNumeric); ++i) {
     options[i] = ASCIIToUTF16(kMonthsNumeric[i]);
   }
@@ -232,7 +232,7 @@ TEST(CreditCardTest, CreditCardMonthAbbreviated) {
     "Jan", "Feb", "Mar", "Apr", "May", "Jun",
     "Jul", "Aug", "Sep", "Oct", "Nov", "Dec",
   };
-  std::vector<string16> options(arraysize(kMonthsAbbreviated));
+  std::vector<base::string16> options(arraysize(kMonthsAbbreviated));
   for (size_t i = 0; i < arraysize(kMonthsAbbreviated); ++i) {
     options[i] = ASCIIToUTF16(kMonthsAbbreviated[i]);
   }
@@ -253,7 +253,7 @@ TEST(CreditCardTest, CreditCardMonthFull) {
     "January", "February", "March", "April", "May", "June",
     "July", "August", "September", "October", "November", "December",
   };
-  std::vector<string16> options(arraysize(kMonthsFull));
+  std::vector<base::string16> options(arraysize(kMonthsFull));
   for (size_t i = 0; i < arraysize(kMonthsFull); ++i) {
     options[i] = ASCIIToUTF16(kMonthsFull[i]);
   }
@@ -273,7 +273,7 @@ TEST(CreditCardTest, CreditCardMonthNumeric) {
   const char* const kMonthsNumeric[] = {
     "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12",
   };
-  std::vector<string16> options(arraysize(kMonthsNumeric));
+  std::vector<base::string16> options(arraysize(kMonthsNumeric));
   for (size_t i = 0; i < arraysize(kMonthsNumeric); ++i) {
     options[i] = ASCIIToUTF16(kMonthsNumeric[i]);
   }
@@ -293,7 +293,7 @@ TEST(CreditCardTest, CreditCardTwoDigitYear) {
   const char* const kYears[] = {
     "12", "13", "14", "15", "16", "17", "18", "19"
   };
-  std::vector<string16> options(arraysize(kYears));
+  std::vector<base::string16> options(arraysize(kYears));
   for (size_t i = 0; i < arraysize(kYears); ++i) {
     options[i] = ASCIIToUTF16(kYears[i]);
   }
@@ -314,7 +314,7 @@ TEST(CreditCardTest, CreditCardTypeSelectControl) {
   const char* const kCreditCardTypes[] = {
     "Visa", "Master Card", "AmEx", "discover"
   };
-  std::vector<string16> options(arraysize(kCreditCardTypes));
+  std::vector<base::string16> options(arraysize(kCreditCardTypes));
   for (size_t i = 0; i < arraysize(kCreditCardTypes); ++i) {
     options[i] = ASCIIToUTF16(kCreditCardTypes[i]);
   }