Update uses of UTF conversions in content/ 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 59 matching lines @@
     base::AutoLock auto_lock(session_storage_database_->db_lock_);
     --session_storage_database_->operation_count_;
     if ((session_storage_database_->is_inconsistent_ ||
          session_storage_database_->db_error_) &&
         session_storage_database_->operation_count_ == 0 &&
         !session_storage_database_->invalid_db_deleted_) {
       // No other operations are ongoing and the data is bad -> delete it now.
       session_storage_database_->db_.reset();
 #if defined(OS_WIN)
       leveldb::DestroyDB(
-          WideToUTF8(session_storage_database_->file_path_.value()),
+          base::WideToUTF8(session_storage_database_->file_path_.value()),
           leveldb::Options());
 #else
       leveldb::DestroyDB(session_storage_database_->file_path_.value(),
                          leveldb::Options());
 #endif
       session_storage_database_->invalid_db_deleted_ = true;
     }
   }
 
  private:
@@ skipping 279 matching lines @@
 }
 
 leveldb::Status SessionStorageDatabase::TryToOpen(leveldb::DB** db) {
   leveldb::Options options;
   // The directory exists but a valid leveldb database might not exist inside it
   // (e.g., a subset of the needed files might be missing). Handle this
   // situation gracefully by creating the database now.
   options.max_open_files = 0;  // Use minimum.
   options.create_if_missing = true;
 #if defined(OS_WIN)
-  return leveldb::DB::Open(options, WideToUTF8(file_path_.value()), db);
+  return leveldb::DB::Open(options, base::WideToUTF8(file_path_.value()), db);
 #elif defined(OS_POSIX)
   return leveldb::DB::Open(options, file_path_.value(), db);
 #endif
 }
 
 bool SessionStorageDatabase::IsOpen() const {
   return db_.get() != NULL;
 }
 
 bool SessionStorageDatabase::CallerErrorCheck(bool ok) const {
@@ skipping 173 matching lines @@
   if (!DatabaseErrorCheck(it->status().ok()))
     return false;
   // Skip the dummy entry "map-<mapid>-".
   for (it->Next(); it->Valid(); it->Next()) {
     std::string key = it->key().ToString();
     if (key.find(map_start_key) != 0) {
       // Iterated past the keys in this map.
       break;
     }
     // Key is of the form "map-<mapid>-<key>".
-    base::string16 key16 = UTF8ToUTF16(key.substr(map_start_key.length()));
+    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());
       (*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) {
   for (DOMStorageValuesMap::const_iterator it = values.begin();
        it != values.end();
        ++it) {
     base::NullableString16 value = it->second;
-    std::string key = MapKey(map_id, UTF16ToUTF8(it->first));
+    std::string key = MapKey(map_id, base::UTF16ToUTF8(it->first));
     if (value.is_null()) {
       batch->Delete(key);
     } else {
       // Convert the raw data stored in base::string16 to raw data stored in
       // std::string.
       const char* data = reinterpret_cast<const char*>(value.string().data());
       size_t size = value.string().size() * 2;
       batch->Put(key, leveldb::Slice(data, size));
     }
   }
@@ skipping 41 matching lines @@
   return true;
 }
 
 bool SessionStorageDatabase::ClearMap(const std::string& map_id,
                                       leveldb::WriteBatch* batch) {
   DOMStorageValuesMap values;
   if (!ReadMap(map_id, leveldb::ReadOptions(), &values, true))
     return false;
   for (DOMStorageValuesMap::const_iterator it = values.begin();
        it != values.end(); ++it)
-    batch->Delete(MapKey(map_id, UTF16ToUTF8(it->first)));
+    batch->Delete(MapKey(map_id, base::UTF16ToUTF8(it->first)));
   return true;
 }
 
 bool SessionStorageDatabase::DeepCopyArea(
     const std::string& namespace_id, const GURL& origin, bool copy_data,
     std::string* map_id, leveldb::WriteBatch* batch) {
   // Example, data before deep copy:
   // | namespace-1- (1 = namespace id)| dummy               |
   // | namespace-1-origin1            | 1 (mapid)           |
   // | namespace-2-                   | dummy               |
@@ skipping 49 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