[SyncFS] Rename BlockingFactor to TaskBlocker

chrome/browser/sync_file_system/drive_backend/conflict_resolver.cc

Index: chrome/browser/sync_file_system/drive_backend/conflict_resolver.cc
diff --git a/chrome/browser/sync_file_system/drive_backend/conflict_resolver.cc b/chrome/browser/sync_file_system/drive_backend/conflict_resolver.cc
index 51db34957f857cea1bb6b20c4d996ba28833d4b2..c7809305d7484280304350216c8b1aa83df5bfea 100644
--- a/chrome/browser/sync_file_system/drive_backend/conflict_resolver.cc
+++ b/chrome/browser/sync_file_system/drive_backend/conflict_resolver.cc
@@ -33,10 +33,10 @@ ConflictResolver::~ConflictResolver() {}
 void ConflictResolver::RunPreflight(scoped_ptr<SyncTaskToken> token) {
   token->InitializeTaskLog("Conflict Resolution");
 
-  scoped_ptr<BlockingFactor> blocking_factor(new BlockingFactor);
-  blocking_factor->exclusive = true;
-  SyncTaskManager::UpdateBlockingFactor(
-      token.Pass(), blocking_factor.Pass(),
+  scoped_ptr<TaskBlocker> task_blocker(new TaskBlocker);
+  task_blocker->exclusive = true;
+  SyncTaskManager::UpdateTaskBlocker(
+      token.Pass(), task_blocker.Pass(),
       base::Bind(&ConflictResolver::RunExclusive,
                  weak_ptr_factory_.GetWeakPtr()));
 }