Some clean up in drive::file_system.

- Consolidate the naming and the argument order of each Operation's constructor.
See DriveOperations::Init. I chose the order:
(observer,scheduler,metadata,cache,file_system,task_runner).
- Remove comments mentioning to running thread. Now our code base
  is clean enough about thread safety, even without comments.
- Remove "callback must not be null" from private method comments.
- Fix incorrect #include and forward declarations.
- (Piggyback: One tiny irrelevant comment fix in file_system_util.h)

BUG=none

Review URL: https://chromiumcodereview.appspot.com/15047015

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

1 files changed, 14 insertions, 15 deletions

diff --git a/chrome/browser/chromeos/drive/file_system/move_operation.cc b/chrome/browser/chromeos/drive/file_system/move_operation.cc
index 3053bef..c7e490a 100644
--- a/chrome/browser/chromeos/drive/file_system/move_operation.cc
+++ b/chrome/browser/chromeos/drive/file_system/move_operation.cc
@@ -5,7 +5,6 @@
 #include "chrome/browser/chromeos/drive/file_system/move_operation.h"
 
 #include "chrome/browser/chromeos/drive/drive.pb.h"
-#include "chrome/browser/chromeos/drive/file_cache.h"
 #include "chrome/browser/chromeos/drive/file_system/operation_observer.h"
 #include "chrome/browser/chromeos/drive/file_system_util.h"
 #include "chrome/browser/chromeos/drive/job_scheduler.h"
@@ -16,12 +15,12 @@ using content::BrowserThread;
 namespace drive {
 namespace file_system {
 
-MoveOperation::MoveOperation(JobScheduler* job_scheduler,
-                             internal::ResourceMetadata* metadata,
-                             OperationObserver* observer)
-  : job_scheduler_(job_scheduler),
+MoveOperation::MoveOperation(OperationObserver* observer,
+                             JobScheduler* scheduler,
+                             internal::ResourceMetadata* metadata)
+  : observer_(observer),
+    scheduler_(scheduler),
     metadata_(metadata),
-    observer_(observer),
     weak_ptr_factory_(this) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 }
@@ -153,13 +152,13 @@ void MoveOperation::Rename(const std::string& src_id,
       new_name_has_hosted_extension ? new_name.RemoveExtension() : new_name);
 
   // Rename on the server.
-  job_scheduler_->RenameResource(src_id,
-                                 new_name_arg.AsUTF8Unsafe(),
-                                 base::Bind(&MoveOperation::RenameLocally,
-                                            weak_ptr_factory_.GetWeakPtr(),
-                                            src_path,
-                                            new_name_arg,
-                                            callback));
+  scheduler_->RenameResource(src_id,
+                             new_name_arg.AsUTF8Unsafe(),
+                             base::Bind(&MoveOperation::RenameLocally,
+                                        weak_ptr_factory_.GetWeakPtr(),
+                                        src_path,
+                                        new_name_arg,
+                                        callback));
 }
 
 void MoveOperation::RenameLocally(const base::FilePath& src_path,
@@ -184,7 +183,7 @@ void MoveOperation::AddToDirectory(const std::string& src_id,
                                    const FileMoveCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
-  job_scheduler_->AddResourceToDirectory(
+  scheduler_->AddResourceToDirectory(
       dest_dir_id, src_id,
       base::Bind(&MoveOperation::AddToDirectoryLocally,
                  weak_ptr_factory_.GetWeakPtr(),
@@ -213,7 +212,7 @@ void MoveOperation::RemoveFromDirectory(
     const FileOperationCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
-  job_scheduler_->RemoveResourceFromDirectory(
+  scheduler_->RemoveResourceFromDirectory(
       directory_resource_id,
       resource_id,
       base::Bind(&MoveOperation::RemoveFromDirectoryCompleted,