Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / sync_file_system / drive_backend / task_dependency_manager_unittest.cc

diff --git a/src/chrome/browser/sync_file_system/drive_backend/task_dependency_manager_unittest.cc b/src/chrome/browser/sync_file_system/drive_backend/task_dependency_manager_unittest.cc
index 4a321a7..91e608c 100644 (file)
--- a/src/chrome/browser/sync_file_system/drive_backend/task_dependency_manager_unittest.cc
+++ b/src/chrome/browser/sync_file_system/drive_backend/task_dependency_manager_unittest.cc
@@ -21,7 +21,7 @@ base::FilePath MakePath(const base::FilePath::StringType& path) {
 bool InsertPath(TaskDependencyManager* manager,
                 const std::string& app_id,
                 const base::FilePath::StringType& path) {
-  BlockingFactor blocker;
+  TaskBlocker blocker;
   blocker.app_id = app_id;
   blocker.paths.push_back(MakePath(path));
   return manager->Insert(&blocker);
@@ -30,20 +30,20 @@ bool InsertPath(TaskDependencyManager* manager,
 void ErasePath(TaskDependencyManager* manager,
                const std::string& app_id,
                const base::FilePath::StringType& path) {
-  BlockingFactor blocker;
+  TaskBlocker blocker;
   blocker.app_id = app_id;
   blocker.paths.push_back(MakePath(path));
   return manager->Erase(&blocker);
 }
 
 bool InsertExclusiveTask(TaskDependencyManager* manager) {
-  BlockingFactor blocker;
+  TaskBlocker blocker;
   blocker.exclusive = true;
   return manager->Insert(&blocker);
 }
 
 void EraseExclusiveTask(TaskDependencyManager* manager) {
-  BlockingFactor blocker;
+  TaskBlocker blocker;
   blocker.exclusive = true;
   manager->Erase(&blocker);
 }
@@ -52,7 +52,7 @@ void EraseExclusiveTask(TaskDependencyManager* manager) {
 
 TEST(TaskDependencyManagerTest, BasicTest) {
   TaskDependencyManager manager;
-  BlockingFactor blocker;
+  TaskBlocker blocker;
   blocker.app_id = "app_id";
   blocker.paths.push_back(MakePath(FPL("/folder/file")));
   blocker.file_ids.push_back("file_id");
@@ -109,16 +109,16 @@ TEST(TaskDependencyManagerTest, ExclusiveTask) {
 TEST(TaskDependencyManagerTest, PermissiveTask) {
   TaskDependencyManager manager;
 
-  EXPECT_TRUE(manager.Insert(NULL));
+  EXPECT_TRUE(manager.Insert(nullptr));
   EXPECT_TRUE(InsertPath(&manager, "app_id", FPL("/foo/bar")));
   EXPECT_FALSE(InsertExclusiveTask(&manager));
   ErasePath(&manager, "app_id", FPL("/foo/bar"));
 
   EXPECT_FALSE(InsertExclusiveTask(&manager));
-  manager.Erase(NULL);
+  manager.Erase(nullptr);
   EXPECT_TRUE(InsertExclusiveTask(&manager));
 
-  EXPECT_FALSE(manager.Insert(NULL));
+  EXPECT_FALSE(manager.Insert(nullptr));
 
   EraseExclusiveTask(&manager);
 }