1 files changed, 11 insertions, 10 deletions
diff --git a/chromium/content/browser/dom_storage/session_storage_database_unittest.cc b/chromium/content/browser/dom_storage/session_storage_database_unittest.cc
index 2f86c3b9918..71c8063ef44 100644
--- a/chromium/content/browser/dom_storage/session_storage_database_unittest.cc
+++ b/chromium/content/browser/dom_storage/session_storage_database_unittest.cc
@@ -87,13 +87,13 @@ SessionStorageDatabaseTest::SessionStorageDatabaseTest()
       kNamespace1("namespace1"),
       kNamespace2("namespace2"),
       kNamespaceClone("wascloned"),
-      kKey1(ASCIIToUTF16("key1")),
-      kKey2(ASCIIToUTF16("key2")),
-      kKey3(ASCIIToUTF16("key3")),
-      kValue1(ASCIIToUTF16("value1"), false),
-      kValue2(ASCIIToUTF16("value2"), false),
-      kValue3(ASCIIToUTF16("value3"), false),
-      kValue4(ASCIIToUTF16("value4"), false) { }
+      kKey1(base::ASCIIToUTF16("key1")),
+      kKey2(base::ASCIIToUTF16("key2")),
+      kKey3(base::ASCIIToUTF16("key3")),
+      kValue1(base::ASCIIToUTF16("value1"), false),
+      kValue2(base::ASCIIToUTF16("value2"), false),
+      kValue3(base::ASCIIToUTF16("value3"), false),
+      kValue4(base::ASCIIToUTF16("value4"), false) { }
 
 SessionStorageDatabaseTest::~SessionStorageDatabaseTest() { }
 
@@ -303,9 +303,10 @@ void SessionStorageDatabaseTest::DumpData() const {
     if (IsMapValueKey(it->key().ToString(), &dummy_map_id)) {
       // Convert the value back to base::string16.
       base::string16 value;
-      size_t len = it->value().size() / sizeof(char16);
+      size_t len = it->value().size() / sizeof(base::char16);
       value.resize(len);
-      value.assign(reinterpret_cast<const char16*>(it->value().data()), len);
+      value.assign(
+          reinterpret_cast<const base::char16*>(it->value().data()), len);
       LOG(WARNING) << it->key().ToString() << ": " << value;
     } else {
       LOG(WARNING) << it->key().ToString() << ": " << it->value().ToString();
@@ -699,7 +700,7 @@ TEST_F(SessionStorageDatabaseTest, WriteRawBytes) {
   unsigned char raw_data[10] = {255, 0, 0, 0, 1, 2, 3, 4, 5, 0};
   DOMStorageValuesMap changes;
   base::string16 string_with_raw_data;
-  string_with_raw_data.assign(reinterpret_cast<char16*>(raw_data), 5);
+  string_with_raw_data.assign(reinterpret_cast<base::char16*>(raw_data), 5);
   changes[kKey1] = base::NullableString16(string_with_raw_data, false);
   EXPECT_TRUE(db_->CommitAreaChanges(kNamespace1, kOrigin1, false, changes));
   CheckDatabaseConsistency();