Index: content/browser/indexed_db/indexed_db_leveldb_coding_unittest.cc |
diff --git a/content/browser/indexed_db/indexed_db_leveldb_coding_unittest.cc b/content/browser/indexed_db/indexed_db_leveldb_coding_unittest.cc |
index 97128ecd53f7c31f28e4b5cb80cc60cc1ebf59c2..07bf2b18fc450b6e0b0d0d7c55276a9dc7069dfb 100644 |
--- a/content/browser/indexed_db/indexed_db_leveldb_coding_unittest.cc |
+++ b/content/browser/indexed_db/indexed_db_leveldb_coding_unittest.cc |
@@ -317,8 +317,8 @@ static std::string WrappedEncodeString(base::string16 value) { |
} |
TEST(IndexedDBLevelDBCodingTest, EncodeString) { |
- const char16 test_string_a[] = {'f', 'o', 'o', '\0'}; |
- const char16 test_string_b[] = {0xdead, 0xbeef, '\0'}; |
+ const base::char16 test_string_a[] = {'f', 'o', 'o', '\0'}; |
+ const base::char16 test_string_b[] = {0xdead, 0xbeef, '\0'}; |
EXPECT_EQ(static_cast<size_t>(0), |
WrappedEncodeString(ASCIIToUTF16("")).size()); |
@@ -333,8 +333,8 @@ TEST(IndexedDBLevelDBCodingTest, EncodeString) { |
} |
TEST(IndexedDBLevelDBCodingTest, DecodeString) { |
- const char16 test_string_a[] = {'f', 'o', 'o', '\0'}; |
- const char16 test_string_b[] = {0xdead, 0xbeef, '\0'}; |
+ const base::char16 test_string_a[] = {'f', 'o', 'o', '\0'}; |
+ const base::char16 test_string_b[] = {0xdead, 0xbeef, '\0'}; |
std::vector<base::string16> test_cases; |
test_cases.push_back(base::string16()); |
@@ -373,8 +373,8 @@ static std::string WrappedEncodeStringWithLength(base::string16 value) { |
} |
TEST(IndexedDBLevelDBCodingTest, EncodeStringWithLength) { |
- const char16 test_string_a[] = {'f', 'o', 'o', '\0'}; |
- const char16 test_string_b[] = {0xdead, 0xbeef, '\0'}; |
+ const base::char16 test_string_a[] = {'f', 'o', 'o', '\0'}; |
+ const base::char16 test_string_b[] = {0xdead, 0xbeef, '\0'}; |
EXPECT_EQ(static_cast<size_t>(1), |
WrappedEncodeStringWithLength(base::string16()).size()); |
@@ -389,11 +389,11 @@ TEST(IndexedDBLevelDBCodingTest, EncodeStringWithLength) { |
} |
TEST(IndexedDBLevelDBCodingTest, DecodeStringWithLength) { |
- const char16 test_string_a[] = {'f', 'o', 'o', '\0'}; |
- const char16 test_string_b[] = {0xdead, 0xbeef, '\0'}; |
+ const base::char16 test_string_a[] = {'f', 'o', 'o', '\0'}; |
+ const base::char16 test_string_b[] = {0xdead, 0xbeef, '\0'}; |
const int kLongStringLen = 1234; |
- char16 long_string[kLongStringLen + 1]; |
+ base::char16 long_string[kLongStringLen + 1]; |
for (int i = 0; i < kLongStringLen; ++i) |
long_string[i] = i; |
long_string[kLongStringLen] = 0; |
@@ -445,12 +445,12 @@ static int CompareStrings(const std::string& p, const std::string& q) { |
} |
TEST(IndexedDBLevelDBCodingTest, CompareEncodedStringsWithLength) { |
- const char16 test_string_a[] = {0x1000, 0x1000, '\0'}; |
- const char16 test_string_b[] = {0x1000, 0x1000, 0x1000, '\0'}; |
- const char16 test_string_c[] = {0x1000, 0x1000, 0x1001, '\0'}; |
- const char16 test_string_d[] = {0x1001, 0x1000, 0x1000, '\0'}; |
- const char16 test_string_e[] = {0xd834, 0xdd1e, '\0'}; |
- const char16 test_string_f[] = {0xfffd, '\0'}; |
+ const base::char16 test_string_a[] = {0x1000, 0x1000, '\0'}; |
+ const base::char16 test_string_b[] = {0x1000, 0x1000, 0x1000, '\0'}; |
+ const base::char16 test_string_c[] = {0x1000, 0x1000, 0x1001, '\0'}; |
+ const base::char16 test_string_d[] = {0x1001, 0x1000, 0x1000, '\0'}; |
+ const base::char16 test_string_e[] = {0xd834, 0xdd1e, '\0'}; |
+ const base::char16 test_string_f[] = {0xfffd, '\0'}; |
std::vector<base::string16> test_cases; |
test_cases.push_back(ASCIIToUTF16("")); |