Define FilePath::NormalizePathSeparators on all platforms

webkit/fileapi/isolated_context_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "webkit/fileapi/isolated_context.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/logging.h"
@@ skipping 13 matching lines @@
 
 const FilePath kTestPaths[] = {
   FilePath(DRIVE FPL("/a/b")),
   FilePath(DRIVE FPL("/c/d/e")),
   FilePath(DRIVE FPL("/h/")),
 #if defined(FILE_PATH_USES_WIN_SEPARATORS)
   FilePath(DRIVE FPL("\\foo\\bar")),
 #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() {
     id_ = IsolatedContext::GetInstance()->RegisterIsolatedFileSystem(fileset_);
     ASSERT_FALSE(id_.empty());
   }
 
   void TearDown() {
     IsolatedContext::GetInstance()->RevokeIsolatedFileSystem(id_);
   }
@@ skipping 22 matching lines @@
   // See if the basename of each registered kTestPaths (that is what we
   // register in SetUp() by RegisterIsolatedFileSystem) is properly cracked as
   // a valid virtual path in the isolated filesystem.
   for (size_t i = 0; i < arraysize(kTestPaths); ++i) {
     FilePath virtual_path = isolated_context()->CreateVirtualPath(
         id_, kTestPaths[i].BaseName());
     std::string cracked_id;
     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);
   }
 
   // Revoking the current one and registering a new (empty) one.
   isolated_context()->RevokeIsolatedFileSystem(id_);
   std::string id2 = isolated_context()->RegisterIsolatedFileSystem(
       std::set<FilePath>());
 
   // Make sure the GetTopLevelPaths returns true only for the new one.
   ASSERT_TRUE(isolated_context()->GetTopLevelPaths(id2, &toplevels));
@@ skipping 29 matching lines @@
           id_, kTestPaths[i].BaseName().Append(relatives[j].path));
       std::string cracked_id;
       FilePath cracked_path;
       if (!relatives[j].valid) {
         ASSERT_FALSE(isolated_context()->CrackIsolatedPath(
             virtual_path, &cracked_id, &cracked_path));
         continue;
       }
       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);
     }
   }
 }
 
 TEST_F(IsolatedContextTest, TestWithVirtualRoot) {
   std::string cracked_id;
   FilePath cracked_path;
   const FilePath root(FPL("/"));
 
   // Trying to crack virtual root "/" returns true but with empty cracked path
   // as "/" of the isolated filesystem is a pure virtual directory
   // that has no corresponding platform directory.
   FilePath virtual_path = isolated_context()->CreateVirtualPath(id_, root);
   ASSERT_TRUE(isolated_context()->CrackIsolatedPath(
       virtual_path, &cracked_id, &cracked_path));
   ASSERT_EQ(FPL(""), cracked_path.value());
   ASSERT_EQ(id_, cracked_id);
 
   // Trying to crack "/foo" should fail (because "foo" is not the one
   // included in the kTestPaths).
   virtual_path = isolated_context()->CreateVirtualPath(
       id_, FilePath(FPL("foo")));
   ASSERT_FALSE(isolated_context()->CrackIsolatedPath(
       virtual_path, &cracked_id, &cracked_path));
 }
 
 }  // namespace fileapi