Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / tools / gn / generate_test_gn_data.cc

diff --git a/src/tools/gn/generate_test_gn_data.cc b/src/tools/gn/generate_test_gn_data.cc
index 017c4c4..fe4fdc7 100644 (file)
--- a/src/tools/gn/generate_test_gn_data.cc
+++ b/src/tools/gn/generate_test_gn_data.cc
@@ -5,8 +5,8 @@
 #include <fstream>
 #include <iostream>
 
-#include "base/file_util.h"
 #include "base/files/file_path.h"
+#include "base/files/file_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
@@ -18,7 +18,7 @@ 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
@@ -26,7 +26,7 @@ base::FilePath UTF8ToFilePath(const std::string& s) {
 
 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
@@ -82,7 +82,7 @@ void WriteLevel(const std::vector<int>& repo_path,
 
   // Don't keep the file open while recursing.
   {
-    file_util::CreateDirectory(dirname);
+    base::CreateDirectory(dirname);
 
     std::ofstream file;
     file.open(FilePathToUTF8(filename).c_str(),