Convert string16 -> base::string16 in components/

components/webdata/autofill/web_database_migration_unittest.cc

 // Copyright (c) 2012 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 <string>
 
 #include "base/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/guid.h"
 #include "base/message_loop.h"
@@ skipping 21 matching lines @@
 #include "sql/statement.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using base::Time;
 using content::BrowserThread;
 
 namespace {
 
 void AutofillProfile31FromStatement(const sql::Statement& s,
                                     AutofillProfile* profile,
-                                    string16* label,
+                                    base::string16* label,
                                     int* unique_id,
                                     int64* date_modified) {
   DCHECK(profile);
   DCHECK(label);
   DCHECK(unique_id);
   DCHECK(date_modified);
   *label = s.ColumnString16(0);
   *unique_id = s.ColumnInt(1);
   profile->SetRawInfo(NAME_FIRST, s.ColumnString16(2));
   profile->SetRawInfo(NAME_MIDDLE, s.ColumnString16(3));
@@ skipping 24 matching lines @@
   profile->SetRawInfo(ADDRESS_HOME_LINE2, s.ColumnString16(3));
   profile->SetRawInfo(ADDRESS_HOME_CITY, s.ColumnString16(4));
   profile->SetRawInfo(ADDRESS_HOME_STATE, s.ColumnString16(5));
   profile->SetRawInfo(ADDRESS_HOME_ZIP, s.ColumnString16(6));
   profile->SetInfo(ADDRESS_HOME_COUNTRY, s.ColumnString16(7), "en-US");
   *date_modified = s.ColumnInt64(8);
 }
 
 void CreditCard31FromStatement(const sql::Statement& s,
                               CreditCard* credit_card,
-                              string16* label,
+                              base::string16* label,
                               int* unique_id,
                               std::string* encrypted_number,
                               int64* date_modified) {
   DCHECK(credit_card);
   DCHECK(label);
   DCHECK(unique_id);
   DCHECK(encrypted_number);
   DCHECK(date_modified);
   *label = s.ColumnString16(0);
   *unique_id = s.ColumnInt(1);
@@ skipping 610 matching lines @@
 
 // Removes unique IDs and make GUIDs the primary key.  Also removes unused
 // columns.
 TEST_F(WebDatabaseMigrationTest, MigrateVersion31ToCurrent) {
   // Initialize the database.
   ASSERT_NO_FATAL_FAILURE(LoadDatabase(FILE_PATH_LITERAL("version_31.sql")));
 
   // Verify pre-conditions. These are expectations for version 30 of the
   // database.
   AutofillProfile profile;
-  string16 profile_label;
+  base::string16 profile_label;
   int profile_unique_id = 0;
   int64 profile_date_modified = 0;
   CreditCard credit_card;
-  string16 cc_label;
+  base::string16 cc_label;
   int cc_unique_id = 0;
   std::string cc_number_encrypted;
   int64 cc_date_modified = 0;
   {
     sql::Connection connection;
     ASSERT_TRUE(connection.Open(GetDatabasePath()));
 
     // Verify existence of columns we'll be changing.
     EXPECT_TRUE(connection.DoesColumnExist("autofill_profiles", "guid"));
     EXPECT_TRUE(connection.DoesColumnExist("autofill_profiles", "unique_id"));
@@ skipping 95 matching lines @@
     EXPECT_EQ(profile_date_modified, profile_date_modified_a);
 
     sql::Statement s2(
         connection.GetUniqueStatement(
             "SELECT guid, name_on_card, expiration_month, "
             "expiration_year, card_number_encrypted, date_modified "
             "FROM credit_cards"));
     ASSERT_TRUE(s2.Step());
 
     CreditCard credit_card_a;
-    string16 cc_label_a;
+    base::string16 cc_label_a;
     std::string cc_number_encrypted_a;
     int64 cc_date_modified_a = 0;
     EXPECT_NO_FATAL_FAILURE(CreditCard32FromStatement(s2,
                                                       &credit_card_a,
                                                       &cc_number_encrypted_a,
                                                       &cc_date_modified_a));
     EXPECT_EQ(credit_card, credit_card_a);
     EXPECT_EQ(cc_label, cc_label_a);
     EXPECT_EQ(cc_number_encrypted, cc_number_encrypted_a);
     EXPECT_EQ(cc_date_modified, cc_date_modified_a);
@@ skipping 114 matching lines @@
     EXPECT_EQ(ASCIIToUTF16("94022"), s1.ColumnString16(6));
     EXPECT_EQ(ASCIIToUTF16("United States"), s1.ColumnString16(7));
     EXPECT_EQ(1297882100L, s1.ColumnInt64(8));
 
     // John P. Doe.
     // Gets merged during migration from 35 to 37 due to multi-valued fields.
 
     // Dave Smith.
     ASSERT_TRUE(s1.Step());
     EXPECT_EQ("4C74A9D8-7EEE-423E-F9C2-E7FA70ED1396", s1.ColumnString(0));
-    EXPECT_EQ(string16(), s1.ColumnString16(1));
+    EXPECT_EQ(base::string16(), s1.ColumnString16(1));
     EXPECT_EQ(ASCIIToUTF16("2 Main Street"), s1.ColumnString16(2));
-    EXPECT_EQ(string16(), s1.ColumnString16(3));
+    EXPECT_EQ(base::string16(), s1.ColumnString16(3));
     EXPECT_EQ(ASCIIToUTF16("Los Altos"), s1.ColumnString16(4));
     EXPECT_EQ(ASCIIToUTF16("CA"), s1.ColumnString16(5));
     EXPECT_EQ(ASCIIToUTF16("94022"), s1.ColumnString16(6));
     EXPECT_EQ(ASCIIToUTF16("United States"), s1.ColumnString16(7));
     EXPECT_EQ(1297882100L, s1.ColumnInt64(8));
 
     // Dave Smith (Part 2).
     ASSERT_TRUE(s1.Step());
     EXPECT_EQ("722DF5C4-F74A-294A-46F0-31FFDED0D635", s1.ColumnString(0));
-    EXPECT_EQ(string16(), s1.ColumnString16(1));
+    EXPECT_EQ(base::string16(), s1.ColumnString16(1));
     EXPECT_EQ(ASCIIToUTF16("2 Main St"), s1.ColumnString16(2));
-    EXPECT_EQ(string16(), s1.ColumnString16(3));
+    EXPECT_EQ(base::string16(), s1.ColumnString16(3));
     EXPECT_EQ(ASCIIToUTF16("Los Altos"), s1.ColumnString16(4));
     EXPECT_EQ(ASCIIToUTF16("CA"), s1.ColumnString16(5));
     EXPECT_EQ(ASCIIToUTF16("94022"), s1.ColumnString16(6));
     EXPECT_EQ(ASCIIToUTF16("United States"), s1.ColumnString16(7));
     EXPECT_EQ(1297882100L, s1.ColumnInt64(8));
 
     // Alfred E Newman.
     // Gets culled during migration from 35 to 36 due to incomplete address.
 
     // 3 Main St.
     ASSERT_TRUE(s1.Step());
     EXPECT_EQ("9E5FE298-62C7-83DF-6293-381BC589183F", s1.ColumnString(0));
-    EXPECT_EQ(string16(), s1.ColumnString16(1));
+    EXPECT_EQ(base::string16(), s1.ColumnString16(1));
     EXPECT_EQ(ASCIIToUTF16("3 Main St"), s1.ColumnString16(2));
-    EXPECT_EQ(string16(), s1.ColumnString16(3));
+    EXPECT_EQ(base::string16(), s1.ColumnString16(3));
     EXPECT_EQ(ASCIIToUTF16("Los Altos"), s1.ColumnString16(4));
     EXPECT_EQ(ASCIIToUTF16("CA"), s1.ColumnString16(5));
     EXPECT_EQ(ASCIIToUTF16("94022"), s1.ColumnString16(6));
     EXPECT_EQ(ASCIIToUTF16("United States"), s1.ColumnString16(7));
     EXPECT_EQ(1297882100L, s1.ColumnInt64(8));
 
     // That should be all.
     EXPECT_FALSE(s1.Step());
 
     sql::Statement s2(
         connection.GetUniqueStatement(
             "SELECT guid, first_name, middle_name, last_name "
             "FROM autofill_profile_names"));
 
     // John Doe.
     ASSERT_TRUE(s2.Step());
     EXPECT_EQ("00580526-FF81-EE2A-0546-1AC593A32E2F", s2.ColumnString(0));
     EXPECT_EQ(ASCIIToUTF16("John"), s2.ColumnString16(1));
-    EXPECT_EQ(string16(), s2.ColumnString16(2));
+    EXPECT_EQ(base::string16(), s2.ColumnString16(2));
     EXPECT_EQ(ASCIIToUTF16("Doe"), s2.ColumnString16(3));
 
     // John P. Doe.  Note same guid as above due to merging of multi-valued
     // fields.
     ASSERT_TRUE(s2.Step());
     EXPECT_EQ("00580526-FF81-EE2A-0546-1AC593A32E2F", s2.ColumnString(0));
     EXPECT_EQ(ASCIIToUTF16("John"), s2.ColumnString16(1));
     EXPECT_EQ(ASCIIToUTF16("P."), s2.ColumnString16(2));
     EXPECT_EQ(ASCIIToUTF16("Doe"), s2.ColumnString16(3));
 
     // Dave Smith.
     ASSERT_TRUE(s2.Step());
     EXPECT_EQ("4C74A9D8-7EEE-423E-F9C2-E7FA70ED1396", s2.ColumnString(0));
     EXPECT_EQ(ASCIIToUTF16("Dave"), s2.ColumnString16(1));
-    EXPECT_EQ(string16(), s2.ColumnString16(2));
+    EXPECT_EQ(base::string16(), s2.ColumnString16(2));
     EXPECT_EQ(ASCIIToUTF16("Smith"), s2.ColumnString16(3));
 
     // Dave Smith (Part 2).
     ASSERT_TRUE(s2.Step());
     EXPECT_EQ("722DF5C4-F74A-294A-46F0-31FFDED0D635", s2.ColumnString(0));
     EXPECT_EQ(ASCIIToUTF16("Dave"), s2.ColumnString16(1));
-    EXPECT_EQ(string16(), s2.ColumnString16(2));
+    EXPECT_EQ(base::string16(), s2.ColumnString16(2));
     EXPECT_EQ(ASCIIToUTF16("Smith"), s2.ColumnString16(3));
 
     // Alfred E Newman.
     // Gets culled during migration from 35 to 36 due to incomplete address.
 
     // 3 Main St.
     ASSERT_TRUE(s2.Step());
     EXPECT_EQ("9E5FE298-62C7-83DF-6293-381BC589183F", s2.ColumnString(0));
-    EXPECT_EQ(string16(), s2.ColumnString16(1));
-    EXPECT_EQ(string16(), s2.ColumnString16(2));
-    EXPECT_EQ(string16(), s2.ColumnString16(3));
+    EXPECT_EQ(base::string16(), s2.ColumnString16(1));
+    EXPECT_EQ(base::string16(), s2.ColumnString16(2));
+    EXPECT_EQ(base::string16(), s2.ColumnString16(3));
 
     // Should be all.
     EXPECT_FALSE(s2.Step());
 
     sql::Statement s3(
         connection.GetUniqueStatement(
             "SELECT guid, email "
             "FROM autofill_profile_emails"));
 
     // John Doe.
     ASSERT_TRUE(s3.Step());
     EXPECT_EQ("00580526-FF81-EE2A-0546-1AC593A32E2F", s3.ColumnString(0));
     EXPECT_EQ(ASCIIToUTF16("john@doe.com"), s3.ColumnString16(1));
 
     // John P. Doe.
     // Gets culled during migration from 35 to 37 due to merging of John Doe and
     // John P. Doe addresses.
 
     // 2 Main Street.
     ASSERT_TRUE(s3.Step());
     EXPECT_EQ("4C74A9D8-7EEE-423E-F9C2-E7FA70ED1396", s3.ColumnString(0));
-    EXPECT_EQ(string16(), s3.ColumnString16(1));
+    EXPECT_EQ(base::string16(), s3.ColumnString16(1));
 
     // 2 Main St.
     ASSERT_TRUE(s3.Step());
     EXPECT_EQ("722DF5C4-F74A-294A-46F0-31FFDED0D635", s3.ColumnString(0));
-    EXPECT_EQ(string16(), s3.ColumnString16(1));
+    EXPECT_EQ(base::string16(), s3.ColumnString16(1));
 
     // Alfred E Newman.
     // Gets culled during migration from 35 to 36 due to incomplete address.
 
     // 3 Main St.
     ASSERT_TRUE(s3.Step());
     EXPECT_EQ("9E5FE298-62C7-83DF-6293-381BC589183F", s3.ColumnString(0));
-    EXPECT_EQ(string16(), s3.ColumnString16(1));
+    EXPECT_EQ(base::string16(), s3.ColumnString16(1));
 
     // Should be all.
     EXPECT_FALSE(s3.Step());
 
     sql::Statement s4(
         connection.GetUniqueStatement(
             "SELECT guid, type, number "
             "FROM autofill_profile_phones"));
 
     // John Doe phone.
@@ skipping 10 matching lines @@
     // John P. Doe addresses.
 
     // John P. Doe fax.
     // Gets culled during migration from 35 to 37 due to merging of John Doe and
     // John P. Doe addresses.
 
     // 2 Main Street phone.
     ASSERT_TRUE(s4.Step());
     EXPECT_EQ("4C74A9D8-7EEE-423E-F9C2-E7FA70ED1396", s4.ColumnString(0));
     EXPECT_EQ(0, s4.ColumnInt(1));  // 0 means phone.
-    EXPECT_EQ(string16(), s4.ColumnString16(2));
+    EXPECT_EQ(base::string16(), s4.ColumnString16(2));
 
     // 2 Main Street fax.
     // Gets culled after fax type removed.
 
     // 2 Main St phone.
     ASSERT_TRUE(s4.Step());
     EXPECT_EQ("722DF5C4-F74A-294A-46F0-31FFDED0D635", s4.ColumnString(0));
     EXPECT_EQ(0, s4.ColumnInt(1));  // 0 means phone.
-    EXPECT_EQ(string16(), s4.ColumnString16(2));
+    EXPECT_EQ(base::string16(), s4.ColumnString16(2));
 
     // 2 Main St fax.
     // Gets culled after fax type removed.
 
     // Note no phone or fax for Alfred E Newman.
 
     // 3 Main St phone.
     ASSERT_TRUE(s4.Step());
     EXPECT_EQ("9E5FE298-62C7-83DF-6293-381BC589183F", s4.ColumnString(0));
     EXPECT_EQ(0, s4.ColumnInt(1));  // 0 means phone.
-    EXPECT_EQ(string16(), s4.ColumnString16(2));
+    EXPECT_EQ(base::string16(), s4.ColumnString16(2));
 
     // 2 Main St fax.
     // Gets culled after fax type removed.
 
     // Should be all.
     EXPECT_FALSE(s4.Step());
   }
 }
 
 // Adds a column for the autofill profile's country code.
@@ skipping 832 matching lines @@
     ASSERT_TRUE(sql::MetaTable::DoesTableExist(&connection));
 
     // Check version.
     EXPECT_EQ(kCurrentTestedVersionNumber, VersionFromConnection(&connection));
 
     // A new column should have been created.
     EXPECT_TRUE(connection.DoesColumnExist("keywords",
                                            "search_terms_replacement_key"));
   }
 }