Update some uses of char16 to use the base:: namespace.

content/browser/dom_storage/session_storage_database_unittest.cc

 // Copyright 2013 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 "content/browser/dom_storage/session_storage_database.h"
 
 #include <algorithm>
 #include <map>
 #include <string>
@@ skipping 285 matching lines @@
 
 void SessionStorageDatabaseTest::DumpData() const {
   LOG(WARNING) << "---- Session storage contents";
   scoped_ptr<leveldb::Iterator> it(
       db_->db_->NewIterator(leveldb::ReadOptions()));
   for (it->SeekToFirst(); it->Valid(); it->Next()) {
     int64 dummy_map_id;
     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();
     }
   }
   LOG(WARNING) << "----";
 }
 
 void SessionStorageDatabaseTest::CheckAreaData(
     const std::string& namespace_id, const GURL& origin,
@@ skipping 373 matching lines @@
   // But the copy persists.
   CheckAreaData(kNamespaceClone, kOrigin1, data1);
   CheckAreaData(kNamespaceClone, kOrigin2, data2);
 }
 
 TEST_F(SessionStorageDatabaseTest, WriteRawBytes) {
   // Write data which is not valid utf8 and contains null bytes.
   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();
   DOMStorageValuesMap values;
   db_->ReadAreaValues(kNamespace1, kOrigin1, &values);
   const unsigned char* data =
       reinterpret_cast<const unsigned char*>(values[kKey1].string().data());
   for (int i = 0; i < 10; ++i)
     EXPECT_EQ(raw_data[i], data[i]);
 }
@@ skipping 76 matching lines @@
   ASSERT_TRUE(db_->CommitAreaChanges(kNamespace1, kOrigin2, false, data2));
 
   EXPECT_TRUE(db_->DeleteArea(kNamespace1, kOrigin1));
   EXPECT_TRUE(db_->DeleteArea(kNamespace1, kOrigin2));
   // Check that also the namespace start key was deleted.
   CheckDatabaseConsistency();
 }
 
 
 }  // namespace content