Index: webkit/fileapi/isolated_context_unittest.cc |
diff --git a/webkit/fileapi/isolated_context_unittest.cc b/webkit/fileapi/isolated_context_unittest.cc |
index f367292211a0a22b6838fb9c50d39355d878c0b1..e32adefc9d4144ed678d2d1e92d5ca821fc9f0ad 100644 |
--- a/webkit/fileapi/isolated_context_unittest.cc |
+++ b/webkit/fileapi/isolated_context_unittest.cc |
@@ -31,21 +31,13 @@ const FilePath kTestPaths[] = { |
#endif |
}; |
-static FilePath NormalizePath(const FilePath& path) { |
-#if defined(FILE_PATH_USES_WIN_SEPARATORS) |
- return path.NormalizeWindowsPathSeparators(); |
-#else |
- return path; |
-#endif |
-} |
- |
} // namespace |
class IsolatedContextTest : public testing::Test { |
public: |
IsolatedContextTest() { |
for (size_t i = 0; i < arraysize(kTestPaths); ++i) |
- fileset_.insert(NormalizePath(kTestPaths[i])); |
+ fileset_.insert(kTestPaths[i].NormalizePathSeparators()); |
} |
void SetUp() { |
@@ -88,7 +80,8 @@ TEST_F(IsolatedContextTest, RegisterAndRevokeTest) { |
FilePath cracked_path; |
ASSERT_TRUE(isolated_context()->CrackIsolatedPath( |
virtual_path, &cracked_id, &cracked_path)); |
- ASSERT_EQ(NormalizePath(kTestPaths[i]).value(), cracked_path.value()); |
+ ASSERT_EQ(kTestPaths[i].NormalizePathSeparators().value(), |
+ cracked_path.value()); |
ASSERT_EQ(id_, cracked_id); |
} |
@@ -138,7 +131,8 @@ TEST_F(IsolatedContextTest, CrackWithRelativePaths) { |
} |
ASSERT_TRUE(isolated_context()->CrackIsolatedPath( |
virtual_path, &cracked_id, &cracked_path)); |
- ASSERT_EQ(NormalizePath(kTestPaths[i].Append(relatives[j].path)).value(), |
+ ASSERT_EQ(kTestPaths[i].Append(relatives[j].path) |
+ .NormalizePathSeparators().value(), |
cracked_path.value()); |
ASSERT_EQ(id_, cracked_id); |
} |