Move UTF16ToASCII, remove WideToASCII.

webkit/browser/database/database_util.cc

Index: webkit/browser/database/database_util.cc
diff --git a/webkit/browser/database/database_util.cc b/webkit/browser/database/database_util.cc
index f037638b2087e309dc6170ad60d45edbb4e70391..bfa08791b05251ee6d91c1ba34c0746c021eb6db 100644
--- a/webkit/browser/database/database_util.cc
+++ b/webkit/browser/database/database_util.cc
@@ -32,7 +32,7 @@ bool DatabaseUtil::CrackVfsFileName(const base::string16& vfs_file_name,
   }
 
   if (origin_identifier) {
-    *origin_identifier = UTF16ToASCII(
+    *origin_identifier = base::UTF16ToASCII(
         vfs_file_name.substr(0, first_slash_index));
   }
   if (database_name) {
@@ -61,7 +61,7 @@ base::FilePath DatabaseUtil::GetFullFilePathForVfsFile(
   if (!full_path.empty() && !sqlite_suffix.empty()) {
     DCHECK(full_path.Extension().empty());
     full_path = full_path.InsertBeforeExtensionASCII(
-        UTF16ToASCII(sqlite_suffix));
+        base::UTF16ToASCII(sqlite_suffix));
   }
   // Watch out for directory traversal attempts from a compromised renderer.
   if (full_path.value().find(FILE_PATH_LITERAL("..")) !=