Revert 243802 "PPAPI: Add new PPB_FileRef.MakeDirectory to suppo..."

trunk/src/ppapi/tests/test_file_ref.cc

Index: trunk/src/ppapi/tests/test_file_ref.cc
===================================================================
--- trunk/src/ppapi/tests/test_file_ref.cc	(revision 243841)
+++ trunk/src/ppapi/tests/test_file_ref.cc	(working copy)
@@ -298,60 +298,42 @@
   CHECK_CALLBACK_BEHAVIOR(callback);
   ASSERT_EQ(PP_OK, callback.result());
 
-  // Make a directory.
-  pp::FileRef dir_ref(file_system, "/dir_make_dir");
-  callback.WaitForResult(
-      dir_ref.MakeDirectory(PP_MAKEDIRECTORYFLAG_NONE, callback.GetCallback()));
+  // MakeDirectory.
+  pp::FileRef dir_ref(file_system, "/test_dir_make_directory");
+  callback.WaitForResult(dir_ref.MakeDirectory(callback.GetCallback()));
   CHECK_CALLBACK_BEHAVIOR(callback);
   ASSERT_EQ(PP_OK, callback.result());
 
-  // Make a directory on the existing path without exclusive flag.
-  callback.WaitForResult(
-      dir_ref.MakeDirectory(PP_MAKEDIRECTORYFLAG_NONE, callback.GetCallback()));
-  CHECK_CALLBACK_BEHAVIOR(callback);
-  ASSERT_EQ(PP_OK, callback.result());
-
-  // Making a directory should be aborted.
+  // MakeDirectory aborted.
   int32_t rv = PP_ERROR_FAILED;
   {
-    rv = pp::FileRef(file_system, "/dir_make_dir_abort")
-        .MakeDirectory(PP_MAKEDIRECTORYFLAG_NONE, callback.GetCallback());
+    rv = pp::FileRef(file_system, "/test_dir_make_abort")
+        .MakeDirectory(callback.GetCallback());
   }
   callback.WaitForAbortResult(rv);
   CHECK_CALLBACK_BEHAVIOR(callback);
 
-  // Make nested directories.
-  dir_ref = pp::FileRef(file_system, "/dir_make_nested_dir_1/dir");
+  // MakeDirectoryIncludingAncestors.
+  dir_ref = pp::FileRef(file_system, "/dir_make_dir_1/dir_make_dir_2");
   callback.WaitForResult(
-      dir_ref.MakeDirectory(PP_MAKEDIRECTORYFLAG_WITH_ANCESTORS,
-                            callback.GetCallback()));
+      dir_ref.MakeDirectoryIncludingAncestors(callback.GetCallback()));
   CHECK_CALLBACK_BEHAVIOR(callback);
   ASSERT_EQ(PP_OK, callback.result());
 
-  dir_ref = pp::FileRef(file_system, "/dir_make_nested_dir_2/dir");
-  callback.WaitForResult(
-      dir_ref.MakeDirectory(PP_MAKEDIRECTORYFLAG_NONE, callback.GetCallback()));
+  // MakeDirectoryIncludingAncestors aborted.
+  {
+    rv = pp::FileRef(file_system, "/dir_make_abort_1/dir_make_abort_2")
+        .MakeDirectoryIncludingAncestors(callback.GetCallback());
+  }
+  callback.WaitForAbortResult(rv);
   CHECK_CALLBACK_BEHAVIOR(callback);
-  ASSERT_EQ(PP_ERROR_FILENOTFOUND, callback.result());
 
-  // Ensure there is no directory on the path to test exclusive cases.
-  dir_ref = pp::FileRef(file_system, "/dir_make_dir_exclusive");
-  rv = DeleteDirectoryRecursively(&dir_ref);
-  ASSERT_TRUE(rv == PP_OK || rv == PP_ERROR_FILENOTFOUND);
-
-  // Make a directory exclusively.
-  callback.WaitForResult(
-      dir_ref.MakeDirectory(PP_MAKEDIRECTORYFLAG_EXCLUSIVE,
-                            callback.GetCallback()));
+  // MakeDirectory with nested path should fail.
+  dir_ref = pp::FileRef(file_system, "/dir_make_dir_3/dir_make_dir_4");
+  callback.WaitForResult(dir_ref.MakeDirectory(callback.GetCallback()));
   CHECK_CALLBACK_BEHAVIOR(callback);
-  ASSERT_EQ(PP_OK, callback.result());
+  ASSERT_NE(PP_OK, callback.result());
 
-  callback.WaitForResult(
-      dir_ref.MakeDirectory(PP_MAKEDIRECTORYFLAG_EXCLUSIVE,
-                            callback.GetCallback()));
-  CHECK_CALLBACK_BEHAVIOR(callback);
-  ASSERT_EQ(PP_ERROR_FILEEXISTS, callback.result());
-
   PASS();
 }
 
@@ -450,8 +432,7 @@
   ASSERT_EQ(PP_OK, callback.result());
 
   pp::FileRef dir_ref(file_system, "/dir_delete");
-  callback.WaitForResult(dir_ref.MakeDirectory(
-      PP_MAKEDIRECTORYFLAG_NONE, callback.GetCallback()));
+  callback.WaitForResult(dir_ref.MakeDirectory(callback.GetCallback()));
   CHECK_CALLBACK_BEHAVIOR(callback);
   ASSERT_EQ(PP_OK, callback.result());
 
@@ -461,8 +442,7 @@
 
   pp::FileRef nested_dir_ref(file_system, "/dir_delete_1/dir_delete_2");
   callback.WaitForResult(
-      nested_dir_ref.MakeDirectory(PP_MAKEDIRECTORYFLAG_WITH_ANCESTORS,
-                                   callback.GetCallback()));
+      nested_dir_ref.MakeDirectoryIncludingAncestors(callback.GetCallback()));
   CHECK_CALLBACK_BEHAVIOR(callback);
   ASSERT_EQ(PP_OK, callback.result());
 
@@ -516,8 +496,7 @@
   ASSERT_EQ(PP_OK, callback.result());
 
   pp::FileRef dir_ref(file_system, "/dir_rename");
-  callback.WaitForResult(dir_ref.MakeDirectory(
-      PP_MAKEDIRECTORYFLAG_NONE, callback.GetCallback()));
+  callback.WaitForResult(dir_ref.MakeDirectory(callback.GetCallback()));
   CHECK_CALLBACK_BEHAVIOR(callback);
   ASSERT_EQ(PP_OK, callback.result());
 
@@ -529,8 +508,7 @@
 
   pp::FileRef nested_dir_ref(file_system, "/dir_rename_1/dir_rename_2");
   callback.WaitForResult(
-      nested_dir_ref.MakeDirectory(PP_MAKEDIRECTORYFLAG_WITH_ANCESTORS,
-                                   callback.GetCallback()));
+      nested_dir_ref.MakeDirectoryIncludingAncestors(callback.GetCallback()));
   CHECK_CALLBACK_BEHAVIOR(callback);
   ASSERT_EQ(PP_OK, callback.result());
 
@@ -637,8 +615,7 @@
   std::string test_dir_path = "/dir_for_escaping_test";
   // Create a directory in which to test.
   pp::FileRef test_dir_ref(file_system, test_dir_path.c_str());
-  callback.WaitForResult(test_dir_ref.MakeDirectory(
-      PP_MAKEDIRECTORYFLAG_NONE, callback.GetCallback()));
+  callback.WaitForResult(test_dir_ref.MakeDirectory(callback.GetCallback()));
   CHECK_CALLBACK_BEHAVIOR(callback);
   ASSERT_EQ(PP_OK, callback.result());
 
@@ -686,8 +663,7 @@
   int32_t rv = DeleteDirectoryRecursively(&test_dir);
   ASSERT_TRUE(rv == PP_OK || rv == PP_ERROR_FILENOTFOUND);
 
-  callback.WaitForResult(test_dir.MakeDirectory(
-      PP_MAKEDIRECTORYFLAG_NONE, callback.GetCallback()));
+  callback.WaitForResult(test_dir.MakeDirectory(callback.GetCallback()));
   CHECK_CALLBACK_BEHAVIOR(callback);
   ASSERT_EQ(PP_OK, callback.result());
 
@@ -714,8 +690,7 @@
     buffer << test_dir_name << '/' << dir_prefix << i;
     pp::FileRef file_ref(file_system, buffer.str().c_str());
 
-    callback.WaitForResult(file_ref.MakeDirectory(
-        PP_MAKEDIRECTORYFLAG_NONE, callback.GetCallback()));
+    callback.WaitForResult(file_ref.MakeDirectory(callback.GetCallback()));
     CHECK_CALLBACK_BEHAVIOR(callback);
     ASSERT_EQ(PP_OK, callback.result());