Move path functions from file_util to FilePath object.

webkit/fileapi/local_file_system_operation_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/local_file_system_operation.h"
 
 #include "base/bind.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 528 matching lines @@
   MessageLoop::current()->RunUntilIdle();
   EXPECT_EQ(base::PLATFORM_FILE_ERROR_INVALID_OPERATION, status());
   EXPECT_TRUE(change_observer()->HasNoChange());
 }
 
 TEST_F(LocalFileSystemOperationTest, TestCopyFailureDestParentDoesntExist) {
   // Dest. parent path does not exist.
   base::FilePath src_dir_path(CreateUniqueDir());
   base::FilePath nonexisting_path = base::FilePath(
       FILE_PATH_LITERAL("DontExistDir"));
-  file_util::EnsureEndsWithSeparator(&nonexisting_path);
   base::FilePath nonexisting_file_path(nonexisting_path.Append(
       FILE_PATH_LITERAL("DontExistFile")));
 
   NewOperation()->Copy(
       URLForPath(src_dir_path),
       URLForPath(nonexisting_file_path),
       RecordStatusCallback());
   MessageLoop::current()->RunUntilIdle();
   EXPECT_EQ(base::PLATFORM_FILE_ERROR_NOT_FOUND, status());
   EXPECT_TRUE(change_observer()->HasNoChange());
@@ skipping 322 matching lines @@
       URLForPath(nonexisting_dir_path),
       RecordMetadataCallback());
   MessageLoop::current()->RunUntilIdle();
   EXPECT_EQ(base::PLATFORM_FILE_ERROR_NOT_FOUND, status());
 
   NewOperation()->FileExists(URLForPath(nonexisting_dir_path),
                              RecordStatusCallback());
   MessageLoop::current()->RunUntilIdle();
   EXPECT_EQ(base::PLATFORM_FILE_ERROR_NOT_FOUND, status());
 
-  file_util::EnsureEndsWithSeparator(&nonexisting_dir_path);
+  nonexisting_dir_path = nonexisting_dir_path.AsEndingWithSeparator();
   NewOperation()->DirectoryExists(URLForPath(nonexisting_dir_path),
                                   RecordStatusCallback());
   MessageLoop::current()->RunUntilIdle();
   EXPECT_EQ(base::PLATFORM_FILE_ERROR_NOT_FOUND, status());
   EXPECT_TRUE(change_observer()->HasNoChange());
 }
 
 TEST_F(LocalFileSystemOperationTest, TestExistsAndMetadataSuccess) {
   base::FilePath dir_path(CreateUniqueDir());
   int read_access = 0;
@@ skipping 39 matching lines @@
   ASSERT_FALSE(file_path.empty());
   NewOperation()->DirectoryExists(URLForPath(file_path),
                                   RecordStatusCallback());
   MessageLoop::current()->RunUntilIdle();
   EXPECT_EQ(base::PLATFORM_FILE_ERROR_NOT_A_DIRECTORY, status());
 }
 
 TEST_F(LocalFileSystemOperationTest, TestReadDirFailure) {
   // Path doesn't exist
   base::FilePath nonexisting_dir_path(base::FilePath(
-      FILE_PATH_LITERAL("NonExistingDir")));
-  file_util::EnsureEndsWithSeparator(&nonexisting_dir_path);
+      FILE_PATH_LITERAL("NonExistingDir")).AsEndingWithSeparator());
   NewOperation()->ReadDirectory(URLForPath(nonexisting_dir_path),
                                 RecordReadDirectoryCallback());
   MessageLoop::current()->RunUntilIdle();
   EXPECT_EQ(base::PLATFORM_FILE_ERROR_NOT_FOUND, status());
 
   // File exists.
   base::FilePath dir_path(CreateUniqueDir());
   base::FilePath file_path(CreateUniqueFileInDir(dir_path));
   NewOperation()->ReadDirectory(URLForPath(file_path),
                                 RecordReadDirectoryCallback());
@@ skipping 27 matching lines @@
                 entries()[i].name);
     }
   }
   EXPECT_EQ(1, quota_manager_proxy()->notify_storage_accessed_count());
   EXPECT_TRUE(change_observer()->HasNoChange());
 }
 
 TEST_F(LocalFileSystemOperationTest, TestRemoveFailure) {
   // Path doesn't exist.
   base::FilePath nonexisting_path(base::FilePath(
-      FILE_PATH_LITERAL("NonExistingDir")));
-  file_util::EnsureEndsWithSeparator(&nonexisting_path);
+      FILE_PATH_LITERAL("NonExistingDir")).AsEndingWithSeparator());
 
   NewOperation()->Remove(URLForPath(nonexisting_path), false /* recursive */,
                          RecordStatusCallback());
   MessageLoop::current()->RunUntilIdle();
   EXPECT_EQ(base::PLATFORM_FILE_ERROR_NOT_FOUND, status());
 
   // It's an error to try to remove a non-empty directory if recursive flag
   // is false.
   //      parent_dir
   //       |       |
@@ skipping 200 matching lines @@
   EXPECT_FALSE(info().is_directory);
   EXPECT_EQ(PlatformPath(file_path), path());
   EXPECT_TRUE(change_observer()->HasNoChange());
 
   // The FileSystemOpration implementation does not create a
   // shareable file reference.
   EXPECT_EQ(NULL, shareable_file_ref());
 }
 
 }  // namespace fileapi