Fix up some tests for copy-or-move validator and nearby.

webkit/browser/fileapi/copy_or_move_operation_delegate.cc

 // Copyright (c) 2013 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.
 
 #include "webkit/browser/fileapi/copy_or_move_operation_delegate.h"
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "webkit/browser/fileapi/copy_or_move_file_validator.h"
 #include "webkit/browser/fileapi/file_system_context.h"
@@ skipping 92 matching lines @@
       error != base::PLATFORM_FILE_ERROR_NOT_FOUND) {
     callback_.Run(error);
     return;
   }
 
   // Start to process the source directory recursively.
   // TODO(kinuko): This could be too expensive for same_file_system_==true
   // and operation==MOVE case, probably we can just rename the root directory.
   // http://crbug.com/172187
   StartRecursiveOperation(
-      src_root_, base::Bind(&CopyOrMoveOperationDelegate::DidFinishCopyDir,
-                            AsWeakPtr(), src_root_,
-                            callback_));
+      src_root_,
+      base::Bind(&CopyOrMoveOperationDelegate::DidFinishRecursiveCopyDir,
+                 AsWeakPtr(), src_root_, callback_));
 }
 
 void CopyOrMoveOperationDelegate::CopyOrMoveFile(
     const URLPair& url_pair,
     const StatusCallback& callback) {
   // Same filesystem case.
   if (same_file_system_) {
     if (operation_type_ == OPERATION_MOVE) {
       operation_runner()->MoveFileLocal(url_pair.src, url_pair.dest, callback);
     } else {
@@ skipping 57 matching lines @@
     const base::FilePath& platform_path,
     base::PlatformFileError error) {
   if (error != base::PLATFORM_FILE_OK) {
     callback.Run(error);
     return;
   }
 
   operation_runner()->CopyInForeignFile(platform_path, dest, callback);
 }
 
-void CopyOrMoveOperationDelegate::DidFinishCopyDir(
+void CopyOrMoveOperationDelegate::DidFinishRecursiveCopyDir(
     const FileSystemURL& src,
     const StatusCallback& callback,
     base::PlatformFileError error) {
   if (error != base::PLATFORM_FILE_OK ||
       operation_type_ == OPERATION_COPY) {
     callback.Run(error);
     return;
   }
 
-  DCHECK_EQ(operation_type_, OPERATION_MOVE);
+  DCHECK_EQ(OPERATION_MOVE, operation_type_);
 
   // Remove the source for finalizing move operation.
   operation_runner()->Remove(
       src, true /* recursive */,
       base::Bind(&CopyOrMoveOperationDelegate::DidRemoveSourceForMove,
                  AsWeakPtr(), callback));
 }
 
 void CopyOrMoveOperationDelegate::DidFinishCopy(
     const URLPair& url_pair,
@@ skipping 100 matching lines @@
     const StatusCallback& callback,
     base::PlatformFileError error) {
   if (error != base::PLATFORM_FILE_OK) {
     VLOG(1) << "Error removing destination file after validation error: "
             << error;
   }
   callback.Run(prior_error);
 }
 
 }  // namespace fileapi