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

tools/gn/generate_test_gn_data.cc

 // Copyright (c) 2013 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 <fstream>
 #include <iostream>
 
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 
 // Usage: just run in the directory where you want your test source root to be.
 
 int files_written = 0;
 int targets_written = 0;
 
 base::FilePath UTF8ToFilePath(const std::string& s) {
 #if defined(OS_WIN)
-  return base::FilePath(UTF8ToWide(s));
+  return base::FilePath(base::UTF8ToWide(s));
 #else
   return base::FilePath(s);
 #endif
 }
 
 std::string FilePathToUTF8(const base::FilePath& path) {
 #if defined(OS_WIN)
-  return WideToUTF8(path.value());
+  return base::WideToUTF8(path.value());
 #else
   return path.value();
 #endif
 }
 
 base::FilePath RepoPathToPathName(const std::vector<int>& repo_path) {
   base::FilePath ret;
   for (size_t i = 0; i < repo_path.size(); i++) {
     ret = ret.Append(UTF8ToFilePath(base::IntToString(repo_path[i])));
   }
@@ skipping 80 matching lines @@
   }
 }
 
 int main() {
   WriteLevel(std::vector<int>(), 5, 4, 3, 50);  // 781 files, 2343 targets
   //WriteLevel(std::vector<int>(), 6, 4, 2, 50);
   std::cout << "Wrote " << files_written << " files and "
             << targets_written << " targets.\n";
   return 0;
 }