Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4369)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/webdata/web_database_migration_unittest.cc

Issue 8687002: Cleanup: Convert ASCIIToUTF16("") to string16(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/webui/flash_ui.cc ('k') | net/base/cert_database_nss_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/webdata/web_database_migration_unittest.cc
diff --git a/chrome/browser/webdata/web_database_migration_unittest.cc b/chrome/browser/webdata/web_database_migration_unittest.cc
index 3969e0097815ba5d036138983cd225230294b05e..ef5dbd12e1e8b25aaef3b2b1b4ae892c94804149 100644
--- a/chrome/browser/webdata/web_database_migration_unittest.cc
+++ b/chrome/browser/webdata/web_database_migration_unittest.cc
@@ -1044,9 +1044,9 @@ TEST_F(WebDatabaseMigrationTest, MigrateVersion32ToCurrent) {
// 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));
@@ -1056,9 +1056,9 @@ TEST_F(WebDatabaseMigrationTest, MigrateVersion32ToCurrent) {
// 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));
@@ -1071,9 +1071,9 @@ TEST_F(WebDatabaseMigrationTest, MigrateVersion32ToCurrent) {
// 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));
@@ -1092,7 +1092,7 @@ TEST_F(WebDatabaseMigrationTest, MigrateVersion32ToCurrent) {
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
@@ -1107,14 +1107,14 @@ TEST_F(WebDatabaseMigrationTest, MigrateVersion32ToCurrent) {
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.
@@ -1123,9 +1123,9 @@ TEST_F(WebDatabaseMigrationTest, MigrateVersion32ToCurrent) {
// 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());
@@ -1147,12 +1147,12 @@ TEST_F(WebDatabaseMigrationTest, MigrateVersion32ToCurrent) {
// 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.
@@ -1160,7 +1160,7 @@ TEST_F(WebDatabaseMigrationTest, MigrateVersion32ToCurrent) {
// 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());
@@ -1191,7 +1191,7 @@ TEST_F(WebDatabaseMigrationTest, MigrateVersion32ToCurrent) {
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.
@@ -1200,7 +1200,7 @@ TEST_F(WebDatabaseMigrationTest, MigrateVersion32ToCurrent) {
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.
@@ -1211,7 +1211,7 @@ TEST_F(WebDatabaseMigrationTest, MigrateVersion32ToCurrent) {
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.
« no previous file with comments | « chrome/browser/ui/webui/flash_ui.cc ('k') | net/base/cert_database_nss_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698