[SyncFS] Rename BlockingFactor to TaskBlocker

chrome/browser/sync_file_system/drive_backend/sync_task_manager.h

 // Copyright 2014 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.
 
 #ifndef CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_BACKEND_SYNC_TASK_MANAGER_H_
 #define CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_BACKEND_SYNC_TASK_MANAGER_H_
 
 #include <queue>
 #include <vector>
 
@@ skipping 13 matching lines @@
 
 namespace tracked_objects {
 class Location;
 }
 
 namespace sync_file_system {
 namespace drive_backend {
 
 class SyncTask;
 class SyncTaskToken;
-struct BlockingFactor;
+struct TaskBlocker;
 
 // This class manages asynchronous tasks for Sync FileSystem.  Each task must be
 // either a Task or a SyncTask.
 // The instance runs single task as the foreground task, and multiple tasks as
-// background tasks.  Running background task has a BlockingFactor that
+// background tasks.  Running background task has a TaskBlocker that
 // describes which task can run in parallel.  When a task start running as a
 // background task, SyncTaskManager checks if any running background task
 // doesn't block the new background task, and queues it up if it can't run.
 class SyncTaskManager : public base::SupportsWeakPtr<SyncTaskManager> {
  public:
   typedef base::Callback<void(const SyncStatusCallback& callback)> Task;
   typedef base::Callback<void(scoped_ptr<SyncTaskToken> token)> Continuation;
 
   enum Priority {
     PRIORITY_LOW,
@@ skipping 45 matching lines @@
                           const SyncStatusCallback& callback);
   bool ScheduleSyncTaskIfIdle(const tracked_objects::Location& from_here,
                               scoped_ptr<SyncTask> task,
                               const SyncStatusCallback& callback);
 
   // Notifies SyncTaskManager that the task associated to |token| has finished
   // with |status|.
   static void NotifyTaskDone(scoped_ptr<SyncTaskToken> token,
                              SyncStatusCode status);
 
-  // Updates |blocking_factor| associated to the current task by specified
-  // |blocking_factor| and turns the current task to a background task if
+  // Updates |task_blocker| associated to the current task by specified
+  // |task_blocker| and turns the current task to a background task if
   // the current task is running as a foreground task.
-  // If specified |blocking_factor| is blocked by any other blocking factor
+  // If specified |task_blocker| is blocked by any other blocking factor
   // associated to an existing background task, this function waits for the
   // existing background task to finish.
   // Upon the task is ready to run as a background task, calls |continuation|
   // with new SyncTaskToken.
-  // Note that this function once releases previous |blocking_factor| before
-  // applying new |blocking_factor|.  So, any other task may be run before
+  // Note that this function once releases previous |task_blocker| before
+  // applying new |task_blocker|.  So, any other task may be run before
   // invocation of |continuation|.
-  static void UpdateBlockingFactor(scoped_ptr<SyncTaskToken> current_task_token,
-                                   scoped_ptr<BlockingFactor> blocking_factor,
+  static void UpdateTaskBlocker(scoped_ptr<SyncTaskToken> current_task_token,
+                                   scoped_ptr<TaskBlocker> task_blocker,
                                    const Continuation& continuation);
 
   bool IsRunningTask(int64 task_token_id) const;
 
   void DetachFromSequence();
 
  private:
   struct PendingTask {
     base::Closure task;
     Priority priority;
     int64 seq;
 
     PendingTask();
     PendingTask(const base::Closure& task, Priority pri, int seq);
     ~PendingTask();
   };
 
   struct PendingTaskComparator {
     bool operator()(const PendingTask& left,
                     const PendingTask& right) const;
   };
 
   // Non-static version of NotifyTaskDone.
   void NotifyTaskDoneBody(scoped_ptr<SyncTaskToken> token,
                           SyncStatusCode status);
 
-  // Non-static version of UpdateBlockingFactor.
-  void UpdateBlockingFactorBody(scoped_ptr<SyncTaskToken> foreground_task_token,
+  // Non-static version of UpdateTaskBlocker.
+  void UpdateTaskBlockerBody(scoped_ptr<SyncTaskToken> foreground_task_token,
                                 scoped_ptr<SyncTaskToken> background_task_token,

[peria, 2014/09/08 08:44:47]

nit: fix indent

[tzik, 2014/09/08 08:58:33]

Done.

                                 scoped_ptr<TaskLogger::TaskLog> task_log,
-                                scoped_ptr<BlockingFactor> blocking_factor,
+                                scoped_ptr<TaskBlocker> task_blocker,
                                 const Continuation& continuation);
 
   // This should be called when an async task needs to get a task token.
   scoped_ptr<SyncTaskToken> GetToken(const tracked_objects::Location& from_here,
                                      const SyncStatusCallback& callback);
 
   scoped_ptr<SyncTaskToken> GetTokenForBackgroundTask(
       const tracked_objects::Location& from_here,
       const SyncStatusCallback& callback,
-      scoped_ptr<BlockingFactor> blocking_factor);
+      scoped_ptr<TaskBlocker> task_blocker);
 
   void PushPendingTask(const base::Closure& closure, Priority priority);
 
   void RunTask(scoped_ptr<SyncTaskToken> token,
                scoped_ptr<SyncTask> task);
 
   // Runs a pending task as a foreground task if possible.
   // If |token| is non-NULL, put |token| back to |token_| beforehand.
   void MaybeStartNextForegroundTask(scoped_ptr<SyncTaskToken> token);
 
@@ skipping 28 matching lines @@
   scoped_refptr<base::SequencedTaskRunner> task_runner_;
   base::SequenceChecker sequence_checker_;
 
   DISALLOW_COPY_AND_ASSIGN(SyncTaskManager);
 };
 
 }  // namespace drive_backend
 }  // namespace sync_file_system
 
 #endif  // CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_BACKEND_SYNC_TASK_MANAGER_H_