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

content/browser/dom_storage/session_storage_database.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 "base/file_util.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 560 matching lines @@
       break;
     }
     // Key is of the form "map-<mapid>-<key>".
     base::string16 key16 =
         base::UTF8ToUTF16(key.substr(map_start_key.length()));
     if (only_keys) {
       (*result)[key16] = base::NullableString16();
     } else {
       // Convert the raw data stored in std::string (it->value()) to raw data
       // stored in base::string16.
-      size_t len = it->value().size() / sizeof(char16);
-      const char16* data_ptr =
-          reinterpret_cast<const char16*>(it->value().data());
+      size_t len = it->value().size() / sizeof(base::char16);
+      const base::char16* data_ptr =
+          reinterpret_cast<const base::char16*>(it->value().data());
       (*result)[key16] =
           base::NullableString16(base::string16(data_ptr, len), false);
     }
   }
   return true;
 }
 
 void SessionStorageDatabase::WriteValuesToMap(const std::string& map_id,
                                               const DOMStorageValuesMap& values,
                                               leveldb::WriteBatch* batch) {
@@ skipping 126 matching lines @@
 std::string SessionStorageDatabase::MapKey(const std::string& map_id,
                                            const std::string& key) {
   return base::StringPrintf("map-%s-%s", map_id.c_str(), key.c_str());
 }
 
 const char* SessionStorageDatabase::NextMapIdKey() {
   return "next-map-id";
 }
 
 }  // namespace content