commit 30702003954839fab5b93f191d6826dac0f0ea49
author dcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Tue Apr 09 15:41:12 2013 +0900
committer Qijiang Fan <fqj@google.com> Thu Jun 04 14:22:21 2020 +0900
tree fe4cb87dad64a33e9e45bf69fe28f9fbcbdb8269
parent ce26bbcab895cccd02582f6004ee2222d0bec781

Revert "Rewrite std::string("") to std::string(), Linux edition."

This reverts commit e59558b78e8c6a1b0bd916a724724b638c3c91b6.

Revert "Fix build after r193020."

This reverts commit 558a35897f6b3ffbcaefde927c1f150b815d140a.

Revert "Really fix build after r193020."

This reverts commit e3748a79b523a8d365d4a33ef986eebb4186fa78.

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


CrOS-Libchrome-Original-Commit: 69d7f89d6a93e0fbce451960287066195c6d4ea0

base/file_util_unittest.cc

diff --git a/base/file_util_unittest.cc b/base/file_util_unittest.cc
index 77dd7ac..1f10a33 100644
--- a/base/file_util_unittest.cc
+++ b/base/file_util_unittest.cc
@@ -1846,14 +1846,15 @@
 
   // create the files
   FilePath dir2file = dir2.Append(FILE_PATH_LITERAL("dir2file.txt"));
-  CreateTextFile(dir2file, std::wstring());
+  CreateTextFile(dir2file, L"");
   FilePath dir2innerfile = dir2inner.Append(FILE_PATH_LITERAL("innerfile.txt"));
-  CreateTextFile(dir2innerfile, std::wstring());
+  CreateTextFile(dir2innerfile, L"");
   FilePath file1 = temp_dir_.path().Append(FILE_PATH_LITERAL("file1.txt"));
-  CreateTextFile(file1, std::wstring());
-  FilePath file2_rel = dir2.Append(FilePath::kParentDirectory)
-      .Append(FILE_PATH_LITERAL("file2.txt"));
-  CreateTextFile(file2_rel, std::wstring());
+  CreateTextFile(file1, L"");
+  FilePath file2_rel =
+      dir2.Append(FilePath::kParentDirectory)
+          .Append(FILE_PATH_LITERAL("file2.txt"));
+  CreateTextFile(file2_rel, L"");
   FilePath file2_abs = temp_dir_.path().Append(FILE_PATH_LITERAL("file2.txt"));
 
   // Only enumerate files.