commit 0e569b90b61a26d9465f1d2e088405d61f33850b
author avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Thu Dec 26 16:07:56 2013 +0900
committer Qijiang Fan <fqj@google.com> Thu Jun 04 15:50:18 2020 +0900
tree 4b24a6f42a3b9e11ef6a118c6daabefa1f948fd7
parent 5bcfb95bcbf4e62b25a850ac1845d9b1cdb7c937

Remove UTF string conversion functions from the global namespace.

BUG=330556
TEST=no change
TBR=ben@chromium.org

Review URL: https://codereview.chromium.org/102993018

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242519 0039d316-1c4b-4281-b951-d872f2087c98


CrOS-Libchrome-Original-Commit: f729d7a55a06bb521176d8bc354c8d88b452e067

base/command_line_unittest.cc

diff --git a/base/command_line_unittest.cc b/base/command_line_unittest.cc
index 2c947fc..06c5006 100644
--- a/base/command_line_unittest.cc
+++ b/base/command_line_unittest.cc
@@ -198,10 +198,14 @@
   cl.AppendArg(kFourthArgName);
 
 #if defined(OS_WIN)
-  CommandLine::StringType expected_first_arg(UTF8ToUTF16(kFirstArgName));
-  CommandLine::StringType expected_second_arg(UTF8ToUTF16(kSecondArgName));
-  CommandLine::StringType expected_third_arg(UTF8ToUTF16(kThirdArgName));
-  CommandLine::StringType expected_fourth_arg(UTF8ToUTF16(kFourthArgName));
+  CommandLine::StringType expected_first_arg(
+      base::UTF8ToUTF16(kFirstArgName));
+  CommandLine::StringType expected_second_arg(
+      base::UTF8ToUTF16(kSecondArgName));
+  CommandLine::StringType expected_third_arg(
+      base::UTF8ToUTF16(kThirdArgName));
+  CommandLine::StringType expected_fourth_arg(
+      base::UTF8ToUTF16(kFourthArgName));
 #elif defined(OS_POSIX)
   CommandLine::StringType expected_first_arg(kFirstArgName);
   CommandLine::StringType expected_second_arg(kSecondArgName);