summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
Diffstat (limited to 'tools')
-rw-r--r--tools/gn/filesystem_utils.cc4
-rw-r--r--tools/gn/function_exec_script.cc3
-rw-r--r--tools/gn/generate_test_gn_data.cc4
-rw-r--r--tools/gn/ninja_build_writer.cc4
-rw-r--r--tools/gn/setup.cc3
-rw-r--r--tools/imagediff/image_diff.cc2
-rw-r--r--tools/ipc_fuzzer/mutate/mutate.cc4
-rw-r--r--tools/json_schema_compiler/cc_generator.py2
-rw-r--r--tools/json_schema_compiler/test/error_generation_unittest.cc2
-rw-r--r--tools/memory_watcher/memory_watcher.cc4
10 files changed, 17 insertions, 15 deletions
diff --git a/tools/gn/filesystem_utils.cc b/tools/gn/filesystem_utils.cc
index 5d9b5f1..5866e71 100644
--- a/tools/gn/filesystem_utils.cc
+++ b/tools/gn/filesystem_utils.cc
@@ -197,7 +197,7 @@ const char* GetExtensionForOutputType(Target::OutputType type,
std::string FilePathToUTF8(const base::FilePath::StringType& str) {
#if defined(OS_WIN)
- return WideToUTF8(str);
+ return base::WideToUTF8(str);
#else
return str;
#endif
@@ -205,7 +205,7 @@ std::string FilePathToUTF8(const base::FilePath::StringType& str) {
base::FilePath UTF8ToFilePath(const base::StringPiece& sp) {
#if defined(OS_WIN)
- return base::FilePath(UTF8ToWide(sp));
+ return base::FilePath(base::UTF8ToWide(sp));
#else
return base::FilePath(sp.as_string());
#endif
diff --git a/tools/gn/function_exec_script.cc b/tools/gn/function_exec_script.cc
index c4d2262..b0bc7fd 100644
--- a/tools/gn/function_exec_script.cc
+++ b/tools/gn/function_exec_script.cc
@@ -340,7 +340,8 @@ Value RunExecScript(Scope* scope,
base::TimeTicks begin_exec;
if (g_scheduler->verbose_logging()) {
#if defined(OS_WIN)
- g_scheduler->Log("Pythoning", UTF16ToUTF8(cmdline.GetCommandLineString()));
+ g_scheduler->Log("Pythoning",
+ base::UTF16ToUTF8(cmdline.GetCommandLineString()));
#else
g_scheduler->Log("Pythoning", cmdline.GetCommandLineString());
#endif
diff --git a/tools/gn/generate_test_gn_data.cc b/tools/gn/generate_test_gn_data.cc
index 730ae99..cebf3a0 100644
--- a/tools/gn/generate_test_gn_data.cc
+++ b/tools/gn/generate_test_gn_data.cc
@@ -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
diff --git a/tools/gn/ninja_build_writer.cc b/tools/gn/ninja_build_writer.cc
index a8938b5..ded584b 100644
--- a/tools/gn/ninja_build_writer.cc
+++ b/tools/gn/ninja_build_writer.cc
@@ -29,7 +29,7 @@ std::string GetSelfInvocationCommand(const BuildSettings* build_settings) {
#if defined(OS_WIN)
wchar_t module[MAX_PATH];
GetModuleFileName(NULL, module, MAX_PATH);
- //result = "\"" + WideToUTF8(module) + "\"";
+ //result = "\"" + base::WideToUTF8(module) + "\"";
base::FilePath executable(module);
#elif defined(OS_MACOSX)
// FIXME(brettw) write this on Mac!
@@ -70,7 +70,7 @@ std::string GetSelfInvocationCommand(const BuildSettings* build_settings) {
}
#if defined(OS_WIN)
- return WideToUTF8(cmdline.GetCommandLineString());
+ return base::WideToUTF8(cmdline.GetCommandLineString());
#else
return cmdline.GetCommandLineString();
#endif
diff --git a/tools/gn/setup.cc b/tools/gn/setup.cc
index e074681c..b9b59c6 100644
--- a/tools/gn/setup.cc
+++ b/tools/gn/setup.cc
@@ -320,7 +320,8 @@ void Setup::FillPythonPath() {
"just \"python.exe\"");
python_path = "python.exe";
}
- build_settings_.set_python_path(base::FilePath(UTF8ToUTF16(python_path)));
+ build_settings_.set_python_path(
+ base::FilePath(base::UTF8ToUTF16(python_path)));
#else
build_settings_.set_python_path(base::FilePath("python"));
#endif
diff --git a/tools/imagediff/image_diff.cc b/tools/imagediff/image_diff.cc
index 604f27e..740a397 100644
--- a/tools/imagediff/image_diff.cc
+++ b/tools/imagediff/image_diff.cc
@@ -397,7 +397,7 @@ int DiffImages(const base::FilePath& file1, const base::FilePath& file2,
// paths as non-wide strings anyway.
base::FilePath FilePathFromASCII(const std::string& str) {
#if defined(OS_WIN)
- return base::FilePath(ASCIIToWide(str));
+ return base::FilePath(base::ASCIIToWide(str));
#else
return base::FilePath(str);
#endif
diff --git a/tools/ipc_fuzzer/mutate/mutate.cc b/tools/ipc_fuzzer/mutate/mutate.cc
index 5cad5a1..9350931 100644
--- a/tools/ipc_fuzzer/mutate/mutate.cc
+++ b/tools/ipc_fuzzer/mutate/mutate.cc
@@ -149,8 +149,8 @@ class DefaultFuzzer : public Fuzzer {
virtual void FuzzString16(base::string16* value) OVERRIDE {
FuzzStringType<base::string16>(value, frequency_,
- WideToUTF16(L"BORKED"),
- WideToUTF16(L""));
+ base::WideToUTF16(L"BORKED"),
+ base::WideToUTF16(L""));
}
virtual void FuzzData(char* data, int length) OVERRIDE {
diff --git a/tools/json_schema_compiler/cc_generator.py b/tools/json_schema_compiler/cc_generator.py
index 4193c03..68152b5 100644
--- a/tools/json_schema_compiler/cc_generator.py
+++ b/tools/json_schema_compiler/cc_generator.py
@@ -927,7 +927,7 @@ class _Generator(object):
if not self._generate_error_messages:
return c
(c.Append('if (error)')
- .Append(' *error = UTF8ToUTF16(' + body + ');'))
+ .Append(' *error = base::UTF8ToUTF16(' + body + ');'))
return c
def _GenerateParams(self, params):
diff --git a/tools/json_schema_compiler/test/error_generation_unittest.cc b/tools/json_schema_compiler/test/error_generation_unittest.cc
index f5a24fa..9515f07 100644
--- a/tools/json_schema_compiler/test/error_generation_unittest.cc
+++ b/tools/json_schema_compiler/test/error_generation_unittest.cc
@@ -24,7 +24,7 @@ base::string16 GetPopulateError(const base::Value& value) {
testing::AssertionResult EqualsUtf16(const std::string& expected,
const base::string16& actual) {
- if (ASCIIToUTF16(expected) != actual)
+ if (base::ASCIIToUTF16(expected) != actual)
return testing::AssertionFailure() << expected << " != " << actual;
return testing::AssertionSuccess();
}
diff --git a/tools/memory_watcher/memory_watcher.cc b/tools/memory_watcher/memory_watcher.cc
index 4743a37..38e933c 100644
--- a/tools/memory_watcher/memory_watcher.cc
+++ b/tools/memory_watcher/memory_watcher.cc
@@ -80,10 +80,10 @@ void MemoryWatcher::CloseLogFile() {
if (file_ != NULL) {
fclose(file_);
file_ = NULL;
- std::wstring tmp_name = ASCIIToWide(file_name_);
+ std::wstring tmp_name = base::ASCIIToWide(file_name_);
tmp_name += L".tmp";
base::Move(base::FilePath(tmp_name),
- base::FilePath(ASCIIToWide(file_name_)));
+ base::FilePath(base::ASCIIToWide(file_name_)));
}
}
generated by cgit v1.1 at 2025-03-04 08:43:59 +0000