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

webkit/browser/fileapi/copy_or_move_operation_delegate.h

 // 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.
 
 #ifndef WEBKIT_BROWSER_FILEAPI_COPY_OR_MOVE_OPERATION_DELEGATE_H_
 #define WEBKIT_BROWSER_FILEAPI_COPY_OR_MOVE_OPERATION_DELEGATE_H_
 
 #include <stack>
 
 #include "base/memory/ref_counted.h"
@@ skipping 57 matching lines @@
       base::PlatformFileError error,
       const base::PlatformFileInfo& file_info,
       const base::FilePath& platform_path,
       const scoped_refptr<webkit_blob::ShareableFileReference>& file_ref);
   void DidValidateFile(
       const FileSystemURL& dest,
       const StatusCallback& callback,
       const base::PlatformFileInfo& file_info,
       const base::FilePath& platform_path,
       base::PlatformFileError error);
-  void DidFinishCopyDir(
+  void DidFinishRecursiveCopyDir(
       const FileSystemURL& src,
       const StatusCallback& callback,
       base::PlatformFileError error);
   void DidFinishCopy(
       const URLPair& url_pair,
       const StatusCallback& callback,
       base::PlatformFileError error);
   void DoPostWriteValidation(
       const URLPair& url_pair,
       const StatusCallback& callback,
@@ skipping 25 matching lines @@
   scoped_refptr<webkit_blob::ShareableFileReference> current_file_ref_;
 
   scoped_ptr<CopyOrMoveFileValidator> validator_;
 
   DISALLOW_COPY_AND_ASSIGN(CopyOrMoveOperationDelegate);
 };
 
 }  // namespace fileapi
 
 #endif  // WEBKIT_BROWSER_FILEAPI_COPY_OR_MOVE_OPERATION_DELEGATE_H_