commit f9b1cfb830fcdd74128908856ba4ad184a3f0881
author mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Thu Dec 04 07:17:01 2008 +0900
committer Qijiang Fan <fqj@google.com> Thu Jun 04 09:19:15 2020 +0900
tree 62c23676a23df9d0e08c0712b025531523f7212a
parent d27f782667c1c803a6dbc8c4a27929aa400164c3

Backing out r6315 due to DirectoryWatcherTest.SubDir (base_unittests) failure
(again)


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


CrOS-Libchrome-Original-Commit: c6a4afd88a79ae19a6202fa05df28da813795d99

base/file_path_unittest.cc

diff --git a/base/file_path_unittest.cc b/base/file_path_unittest.cc
index ef6239f..0dee543 100644
--- a/base/file_path_unittest.cc
+++ b/base/file_path_unittest.cc
@@ -273,11 +273,8 @@
   for (size_t i = 0; i < arraysize(cases); ++i) {
     FilePath root(cases[i].inputs[0]);
     FilePath::StringType leaf(cases[i].inputs[1]);
-    FilePath observed_str = root.Append(leaf);
-    EXPECT_EQ(FilePath::StringType(cases[i].expected), observed_str.value()) <<
-              "i: " << i << ", root: " << root.value() << ", leaf: " << leaf;
-    FilePath observed_path = root.Append(FilePath(leaf));
-    EXPECT_EQ(FilePath::StringType(cases[i].expected), observed_path.value()) <<
+    FilePath observed = root.Append(leaf);
+    EXPECT_EQ(FilePath::StringType(cases[i].expected), observed.value()) <<
               "i: " << i << ", root: " << root.value() << ", leaf: " << leaf;
   }
 }