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 20:40:13 +0000
committermark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-03 20:40:13 +0000
commit34004eea5940a37644ce70707470647091958cd2 (patch)
treec8adb835c89f8985093829aba92a8f1156449405 /base/file_path_unittest.cc
parent60d7ac9547b08ce7f9b8bcc48bd4fc420c8b07a9 (diff)
downloadchromium_src-34004eea5940a37644ce70707470647091958cd2.zip
chromium_src-34004eea5940a37644ce70707470647091958cd2.tar.gz
chromium_src-34004eea5940a37644ce70707470647091958cd2.tar.bz2
Backing out r6299 due to DirectoryWatcherTest.SubDir (base_unittests) failure
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6304 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;
}
}