summaryrefslogtreecommitdiffstats
path: root/base/file_path_unittest.cc
diff options
context:
space:
mode:
authormark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-03 22:17:01 +0000
committermark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-03 22:17:01 +0000
commitc6a4afd88a79ae19a6202fa05df28da813795d99 (patch)
tree50e8691911db165d88ef95ccc208be33bb718164 /base/file_path_unittest.cc
parenta0520bf5f570b43fd9fe916c31ec4ff43fb7240f (diff)
downloadchromium_src-c6a4afd88a79ae19a6202fa05df28da813795d99.zip
chromium_src-c6a4afd88a79ae19a6202fa05df28da813795d99.tar.gz
chromium_src-c6a4afd88a79ae19a6202fa05df28da813795d99.tar.bz2
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
Diffstat (limited to 'base/file_path_unittest.cc')
-rw-r--r--base/file_path_unittest.cc7
1 files changed, 2 insertions, 5 deletions
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 @@ TEST(FilePathTest, Append) {
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;
}
}