Cleanup: Convert ASCIIToUTF16("") to string16().

chrome/browser/webdata/web_database_migration_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 <string>
 
 #include "base/file_util.h"
 #include "base/message_loop.h"
 #include "base/scoped_temp_dir.h"
 #include "base/stl_util.h"
@@ skipping 1026 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(ASCIIToUTF16(""), s1.ColumnString16(1));
+    EXPECT_EQ(string16(), s1.ColumnString16(1));
     EXPECT_EQ(ASCIIToUTF16("2 Main Street"), s1.ColumnString16(2));
-    EXPECT_EQ(ASCIIToUTF16(""), s1.ColumnString16(3));
+    EXPECT_EQ(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(ASCIIToUTF16(""), s1.ColumnString16(1));
+    EXPECT_EQ(string16(), s1.ColumnString16(1));
     EXPECT_EQ(ASCIIToUTF16("2 Main St"), s1.ColumnString16(2));
-    EXPECT_EQ(ASCIIToUTF16(""), s1.ColumnString16(3));
+    EXPECT_EQ(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(ASCIIToUTF16(""), s1.ColumnString16(1));
+    EXPECT_EQ(string16(), s1.ColumnString16(1));
     EXPECT_EQ(ASCIIToUTF16("3 Main St"), s1.ColumnString16(2));
-    EXPECT_EQ(ASCIIToUTF16(""), s1.ColumnString16(3));
+    EXPECT_EQ(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(ASCIIToUTF16(""), s2.ColumnString16(2));
+    EXPECT_EQ(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(ASCIIToUTF16(""), s2.ColumnString16(2));
+    EXPECT_EQ(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(ASCIIToUTF16(""), s2.ColumnString16(2));
+    EXPECT_EQ(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(ASCIIToUTF16(""), s2.ColumnString16(1));
-    EXPECT_EQ(ASCIIToUTF16(""), s2.ColumnString16(2));
-    EXPECT_EQ(ASCIIToUTF16(""), s2.ColumnString16(3));
+    EXPECT_EQ(string16(), s2.ColumnString16(1));
+    EXPECT_EQ(string16(), s2.ColumnString16(2));
+    EXPECT_EQ(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(ASCIIToUTF16(""), s3.ColumnString16(1));
+    EXPECT_EQ(string16(), s3.ColumnString16(1));
 
     // 2 Main St.
     ASSERT_TRUE(s3.Step());
     EXPECT_EQ("722DF5C4-F74A-294A-46F0-31FFDED0D635", s3.ColumnString(0));
-    EXPECT_EQ(ASCIIToUTF16(""), s3.ColumnString16(1));
+    EXPECT_EQ(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(ASCIIToUTF16(""), s3.ColumnString16(1));
+    EXPECT_EQ(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(ASCIIToUTF16(""), s4.ColumnString16(2));
+    EXPECT_EQ(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(ASCIIToUTF16(""), s4.ColumnString16(2));
+    EXPECT_EQ(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(ASCIIToUTF16(""), s4.ColumnString16(2));
+    EXPECT_EQ(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 423 matching lines @@
     EXPECT_EQ(default_search_provider_id, default_search_provider_id_backup);
 
     std::string default_search_provider_id_backup_signature;
     EXPECT_TRUE(meta_table.GetValue(
         "Default Search Provider ID Backup Signature",
         &default_search_provider_id_backup_signature));
     EXPECT_FALSE(default_search_provider_id_backup_signature.empty());
   }
 }