Remove UTF string conversion functions from the global namespace.

webkit/browser/database/database_util_unittest.cc

 // Copyright (c) 2011 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 "base/strings/string_piece.h"
 #include "base/strings/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/browser/database/database_util.h"
 #include "webkit/common/database/database_identifier.h"
 
-using base::ASCIIToWide;
+using base::ASCIIToUTF16;
 using webkit_database::DatabaseUtil;
 
 static void TestVfsFilePath(bool expected_result,
                             const char* vfs_file_name,
                             const char* expected_origin_identifier = "",
                             const char* expected_database_name = "",
                             const char* expected_sqlite_suffix = "") {
   std::string origin_identifier;
   base::string16 database_name;
   base::string16 sqlite_suffix;
@@ skipping 44 matching lines @@
 TEST(DatabaseUtilTest, IsValidOriginIdentifier) {
   TestValidOriginIdentifier(true,  "http_bar_0");
   TestValidOriginIdentifier(true,  "");
   TestValidOriginIdentifier(false, "bad..id");
   TestValidOriginIdentifier(false, "bad/id");
   TestValidOriginIdentifier(false, "bad\\id");
   TestValidOriginIdentifier(false, std::string("bad\0id", 6));
 }
 
 }  // namespace webkit_database