Move UTF16ToASCII, remove WideToASCII.

webkit/browser/database/database_util.cc

 // Copyright (c) 2012 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 "webkit/browser/database/database_util.h"
 
 #include "base/basictypes.h"
 #include "base/strings/utf_string_conversions.h"
 #include "webkit/browser/database/database_tracker.h"
 #include "webkit/browser/database/vfs_backend.h"
@@ skipping 14 matching lines @@
   // '/' and '#' must be present in the string. Also, the string cannot start
   // with a '/' (origin_identifier cannot be empty) and '/' must come before '#'
   if ((first_slash_index == base::string16::npos) ||
       (last_pound_index == base::string16::npos) ||
       (first_slash_index == 0) ||
       (first_slash_index > last_pound_index)) {
     return false;
   }
 
   if (origin_identifier) {
-    *origin_identifier = UTF16ToASCII(
+    *origin_identifier = base::UTF16ToASCII(
         vfs_file_name.substr(0, first_slash_index));
   }
   if (database_name) {
     *database_name = vfs_file_name.substr(
         first_slash_index + 1, last_pound_index - first_slash_index - 1);
   }
   if (sqlite_suffix) {
     *sqlite_suffix = vfs_file_name.substr(
         last_pound_index + 1, vfs_file_name.length() - last_pound_index - 1);
   }
   return true;
 }
 
 base::FilePath DatabaseUtil::GetFullFilePathForVfsFile(
     DatabaseTracker* db_tracker, const base::string16& vfs_file_name) {
   std::string origin_identifier;
   base::string16 database_name;
   base::string16 sqlite_suffix;
   if (!CrackVfsFileName(vfs_file_name, &origin_identifier,
                         &database_name, &sqlite_suffix)) {
     return base::FilePath(); // invalid vfs_file_name
   }
 
   base::FilePath full_path = db_tracker->GetFullDBFilePath(
       origin_identifier, database_name);
   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("..")) !=
           base::FilePath::StringType::npos)
     return base::FilePath();
   return full_path;
 }
 
 bool DatabaseUtil::IsValidOriginIdentifier(
     const std::string& origin_identifier) {
   std::string dotdot = "..";
   char forbidden[] = {'\\', '/', '\0'};
 
   std::string::size_type pos = origin_identifier.find(dotdot);
   if (pos == std::string::npos)
     pos = origin_identifier.find_first_of(forbidden, 0, arraysize(forbidden));
 
   return pos == std::string::npos;
 }
 
 }  // namespace webkit_database