Remove UTF string conversion functions from the global namespace.

base/test/test_file_util_posix.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 "base/test/test_file_util.h"
 
 #include <errno.h>
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <sys/types.h>
@@ skipping 71 matching lines @@
 
 #if !defined(OS_LINUX) && !defined(OS_MACOSX)
 bool EvictFileFromSystemCache(const base::FilePath& file) {
   // There doesn't seem to be a POSIX way to cool the disk cache.
   NOTIMPLEMENTED();
   return false;
 }
 #endif
 
 std::wstring FilePathAsWString(const base::FilePath& path) {
-  return UTF8ToWide(path.value());
+  return base::UTF8ToWide(path.value());
 }
 base::FilePath WStringAsFilePath(const std::wstring& path) {
-  return base::FilePath(WideToUTF8(path));
+  return base::FilePath(base::WideToUTF8(path));
 }
 
 bool MakeFileUnreadable(const base::FilePath& path) {
   return DenyFilePermission(path, S_IRUSR | S_IRGRP | S_IROTH);
 }
 
 bool MakeFileUnwritable(const base::FilePath& path) {
   return DenyFilePermission(path, S_IWUSR | S_IWGRP | S_IWOTH);
 }
 
 PermissionRestorer::PermissionRestorer(const base::FilePath& path)
     : path_(path), info_(NULL), length_(0) {
   info_ = GetPermissionInfo(path_, &length_);
   DCHECK(info_ != NULL);
   DCHECK_NE(0u, length_);
 }
 
 PermissionRestorer::~PermissionRestorer() {
   if (!RestorePermissionInfo(path_, info_, length_))
     NOTREACHED();
 }
 
 }  // namespace file_util