Revert 81319 - More filesystem cleanup: convert URL-encoded-as-FilePath to actual URL, where possible without WebKit API changes. The WebKit changes will happen in another CL. This is a resubmit of http://codereview.chromium.org/6767010/ [third try lucky,fourth try persistent?], which bounced most recently due to bugs manifestingonly on XP. There are a few changes here that weren't there [infile_system_operation_write_unittest.cc and file_system_operation.cc], butthey're pretty trivial build/test fixes.BUG=none TEST=noneReview URL: http://codereview.chromium.org/6821065

TBR=ericu@google.com
Review URL: http://codereview.chromium.org/6836002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81320 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 4 insertions, 8 deletions

diff --git a/webkit/fileapi/file_system_util_unittest.cc b/webkit/fileapi/file_system_util_unittest.cc
index 41863ae..e08fec7 100644
--- a/webkit/fileapi/file_system_util_unittest.cc
+++ b/webkit/fileapi/file_system_util_unittest.cc
@@ -29,8 +29,7 @@ TEST_F(FileSystemUtilTest, ParsePersistent) {
       "filesystem:http://chromium.org/persistent/directory/file"));
   EXPECT_EQ("http://chromium.org/", origin_url_.spec());
   EXPECT_EQ(kFileSystemTypePersistent, type_);
-  EXPECT_EQ(FILE_PATH_LITERAL("file"), file_path_.BaseName().value());
-  EXPECT_EQ(FILE_PATH_LITERAL("directory"), file_path_.DirName().value());
+  EXPECT_EQ(FILE_PATH_LITERAL("directory/file"), file_path_.value());
 }
 
 TEST_F(FileSystemUtilTest, ParseTemporary) {
@@ -38,8 +37,7 @@ TEST_F(FileSystemUtilTest, ParseTemporary) {
       "filesystem:http://chromium.org/temporary/directory/file"));
   EXPECT_EQ("http://chromium.org/", origin_url_.spec());
   EXPECT_EQ(kFileSystemTypeTemporary, type_);
-  EXPECT_EQ(FILE_PATH_LITERAL("file"), file_path_.BaseName().value());
-  EXPECT_EQ(FILE_PATH_LITERAL("directory"), file_path_.DirName().value());
+  EXPECT_EQ(FILE_PATH_LITERAL("directory/file"), file_path_.value());
 }
 
 TEST_F(FileSystemUtilTest, EnsureFilePathIsRelative) {
@@ -47,8 +45,7 @@ TEST_F(FileSystemUtilTest, EnsureFilePathIsRelative) {
       "filesystem:http://chromium.org/temporary/////directory/file"));
   EXPECT_EQ("http://chromium.org/", origin_url_.spec());
   EXPECT_EQ(kFileSystemTypeTemporary, type_);
-  EXPECT_EQ(FILE_PATH_LITERAL("file"), file_path_.BaseName().value());
-  EXPECT_EQ(FILE_PATH_LITERAL("directory"), file_path_.DirName().value());
+  EXPECT_EQ(FILE_PATH_LITERAL("directory/file"), file_path_.value());
   EXPECT_FALSE(file_path_.IsAbsolute());
 }
 
@@ -62,8 +59,7 @@ TEST_F(FileSystemUtilTest, RejectBadSchemes) {
 TEST_F(FileSystemUtilTest, UnescapePath) {
   ASSERT_TRUE(CrackFileSystemURL(
       "filesystem:http://chromium.org/persistent/%7Echromium/space%20bar"));
-  EXPECT_EQ(FILE_PATH_LITERAL("space bar"), file_path_.BaseName().value());
-  EXPECT_EQ(FILE_PATH_LITERAL("~chromium"), file_path_.DirName().value());
+  EXPECT_EQ(FILE_PATH_LITERAL("~chromium/space bar"), file_path_.value());
 }
 
 TEST_F(FileSystemUtilTest, RejectBadType) {