Fixed bug: we can now handle "a:b" as a file name.

webkit/fileapi/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/file_system_operation.h"
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 420 matching lines @@
 
   operation()->Move(URLForPath(src_dir_path), URLForPath(dest_dir_path),
                     RecordStatusCallback());
   MessageLoop::current()->RunAllPending();
   EXPECT_EQ(base::PLATFORM_FILE_OK, status());
   EXPECT_FALSE(VirtualDirectoryExists(src_dir_path));
 
   // Make sure we've overwritten but not moved the source under the |dest_dir|.
   EXPECT_TRUE(VirtualDirectoryExists(dest_dir_path));
   EXPECT_FALSE(VirtualDirectoryExists(
-      dest_dir_path.Append(src_dir_path.BaseName())));
+      dest_dir_path.Append(VirtualPath::BaseName(src_dir_path))));
 }
 
 TEST_F(FileSystemOperationTest, TestMoveSuccessSrcDirAndNew) {
   FilePath src_dir_path(CreateVirtualTemporaryDir());
   FilePath dest_parent_dir_path(CreateVirtualTemporaryDir());
   FilePath dest_child_dir_path(dest_parent_dir_path.
       Append(FILE_PATH_LITERAL("NewDirectory")));
 
   operation()->Move(URLForPath(src_dir_path), URLForPath(dest_child_dir_path),
                     RecordStatusCallback());
   MessageLoop::current()->RunAllPending();
   EXPECT_EQ(base::PLATFORM_FILE_OK, status());
   EXPECT_FALSE(VirtualDirectoryExists(src_dir_path));
   EXPECT_TRUE(VirtualDirectoryExists(dest_child_dir_path));
 }
 
 TEST_F(FileSystemOperationTest, TestMoveSuccessSrcDirRecursive) {
   FilePath src_dir_path(CreateVirtualTemporaryDir());
   FilePath child_dir_path(CreateVirtualTemporaryDirInDir(src_dir_path));
   FilePath grandchild_file_path(
       CreateVirtualTemporaryFileInDir(child_dir_path));
 
   FilePath dest_dir_path(CreateVirtualTemporaryDir());
 
   operation()->Move(URLForPath(src_dir_path), URLForPath(dest_dir_path),
                     RecordStatusCallback());
   MessageLoop::current()->RunAllPending();
   EXPECT_EQ(base::PLATFORM_FILE_OK, status());
   EXPECT_TRUE(VirtualDirectoryExists(dest_dir_path.Append(
-      child_dir_path.BaseName())));
+      VirtualPath::BaseName(child_dir_path))));
   EXPECT_TRUE(VirtualFileExists(dest_dir_path.Append(
-      child_dir_path.BaseName()).Append(
-      grandchild_file_path.BaseName())));
+      VirtualPath::BaseName(child_dir_path)).Append(
+      VirtualPath::BaseName(grandchild_file_path))));
 }
 
 TEST_F(FileSystemOperationTest, TestCopyFailureSrcDoesntExist) {
   operation()->Copy(URLForPath(FilePath(FILE_PATH_LITERAL("a"))),
                     URLForPath(FilePath(FILE_PATH_LITERAL("b"))),
                     RecordStatusCallback());
   MessageLoop::current()->RunAllPending();
   EXPECT_EQ(base::PLATFORM_FILE_ERROR_NOT_FOUND, status());
 }
 
@@ skipping 117 matching lines @@
   FilePath dest_dir_path(CreateVirtualTemporaryDir());
 
   operation()->Copy(URLForPath(src_dir_path), URLForPath(dest_dir_path),
                     RecordStatusCallback());
   MessageLoop::current()->RunAllPending();
   EXPECT_EQ(base::PLATFORM_FILE_OK, status());
 
   // Make sure we've overwritten but not copied the source under the |dest_dir|.
   EXPECT_TRUE(VirtualDirectoryExists(dest_dir_path));
   EXPECT_FALSE(VirtualDirectoryExists(
-      dest_dir_path.Append(src_dir_path.BaseName())));
+      dest_dir_path.Append(VirtualPath::BaseName(src_dir_path))));
   EXPECT_EQ(1, quota_manager_proxy()->storage_accessed_count());
 }
 
 TEST_F(FileSystemOperationTest, TestCopySuccessSrcDirAndNew) {
   FilePath src_dir_path(CreateVirtualTemporaryDir());
   FilePath dest_parent_dir_path(CreateVirtualTemporaryDir());
   FilePath dest_child_dir_path(dest_parent_dir_path.
       Append(FILE_PATH_LITERAL("NewDirectory")));
 
   operation()->Copy(URLForPath(src_dir_path), URLForPath(dest_child_dir_path),
@@ skipping 10 matching lines @@
   FilePath grandchild_file_path(
       CreateVirtualTemporaryFileInDir(child_dir_path));
 
   FilePath dest_dir_path(CreateVirtualTemporaryDir());
 
   operation()->Copy(URLForPath(src_dir_path), URLForPath(dest_dir_path),
                     RecordStatusCallback());
   MessageLoop::current()->RunAllPending();
   EXPECT_EQ(base::PLATFORM_FILE_OK, status());
   EXPECT_TRUE(VirtualDirectoryExists(dest_dir_path.Append(
-      child_dir_path.BaseName())));
+      VirtualPath::BaseName(child_dir_path))));
   EXPECT_TRUE(VirtualFileExists(dest_dir_path.Append(
-      child_dir_path.BaseName()).Append(
-      grandchild_file_path.BaseName())));
+      VirtualPath::BaseName(child_dir_path)).Append(
+      VirtualPath::BaseName(grandchild_file_path))));
   EXPECT_EQ(1, quota_manager_proxy()->storage_accessed_count());
 }
 
 TEST_F(FileSystemOperationTest, TestCreateFileFailure) {
   // Already existing file and exclusive true.
   FilePath dir_path(CreateVirtualTemporaryDir());
   FilePath file_path(CreateVirtualTemporaryFileInDir(dir_path));
   operation()->CreateFile(URLForPath(file_path), true,
                           RecordStatusCallback());
   MessageLoop::current()->RunAllPending();
@@ skipping 191 matching lines @@
   ASSERT_FALSE(child_dir_path.empty());
 
   operation()->ReadDirectory(URLForPath(parent_dir_path),
                              RecordReadDirectoryCallback());
   MessageLoop::current()->RunAllPending();
   EXPECT_EQ(base::PLATFORM_FILE_OK, status());
   EXPECT_EQ(2u, entries().size());
 
   for (size_t i = 0; i < entries().size(); ++i) {
     if (entries()[i].is_directory) {
-      EXPECT_EQ(child_dir_path.BaseName().value(),
+      EXPECT_EQ(VirtualPath::BaseName(child_dir_path).value(),
                 entries()[i].name);
     } else {
-      EXPECT_EQ(child_file_path.BaseName().value(),
+      EXPECT_EQ(VirtualPath::BaseName(child_file_path).value(),
                 entries()[i].name);
     }
   }
   EXPECT_EQ(1, quota_manager_proxy()->storage_accessed_count());
 }
 
 TEST_F(FileSystemOperationTest, TestRemoveFailure) {
   // Path doesn't exist.
   FilePath nonexisting_path(FilePath(
       FILE_PATH_LITERAL("NonExistingDir")));
@@ skipping 186 matching lines @@
   EXPECT_EQ(base::PLATFORM_FILE_OK, status());
   EXPECT_FALSE(info().is_directory);
   EXPECT_EQ(PlatformPath(file_path), path());
 
   // The FileSystemOpration implementation does not set the deletable
   // file reference.
   EXPECT_EQ(NULL, deletable_file_ref());
 }
 
 }  // namespace fileapi