Update uses of UTF conversions in ppapi/, printing/, remoting/, rlz/, sandbox/, skia/, sql/, sync/,…

webkit/common/fileapi/file_system_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/common/fileapi/file_system_util.h"
 
 #include <algorithm>
 
 #include "base/files/file_path.h"
 #include "base/logging.h"
@@ skipping 250 matching lines @@
       // Fall through.
     case kFileSystemTypeUnknown:
       return "Unknown";
   }
   NOTREACHED();
   return std::string();
 }
 
 std::string FilePathToString(const base::FilePath& file_path) {
 #if defined(OS_WIN)
-  return UTF16ToUTF8(file_path.value());
+  return base::UTF16ToUTF8(file_path.value());
 #elif defined(OS_POSIX)
   return file_path.value();
 #endif
 }
 
 base::FilePath StringToFilePath(const std::string& file_path_string) {
 #if defined(OS_WIN)
-  return base::FilePath(UTF8ToUTF16(file_path_string));
+  return base::FilePath(base::UTF8ToUTF16(file_path_string));
 #elif defined(OS_POSIX)
   return base::FilePath(file_path_string);
 #endif
 }
 
 blink::WebFileError PlatformFileErrorToWebFileError(
     base::PlatformFileError error_code) {
   switch (error_code) {
     case base::PLATFORM_FILE_ERROR_NOT_FOUND:
       return blink::WebFileErrorNotFound;
@@ skipping 156 matching lines @@
 #if defined(OS_CHROMEOS)
 FileSystemInfo GetFileSystemInfoForChromeOS(const GURL& origin_url) {
   FileSystemType mount_type = fileapi::kFileSystemTypeExternal;
   return FileSystemInfo(fileapi::GetFileSystemName(origin_url, mount_type),
                         fileapi::GetFileSystemRootURI(origin_url, mount_type),
                         mount_type);
 }
 #endif
 
 }  // namespace fileapi