Merge CrossFileUtilHelper to FileUtilHelper as Copy() and Move().

webkit/fileapi/file_system_test_helper.h

 // Copyright (c) 2012 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_FILEAPI_FILE_SYSTEM_TEST_HELPER_H_
 #define WEBKIT_FILEAPI_FILE_SYSTEM_TEST_HELPER_H_
 #pragma once
 
 #include <string>
 
 #include "base/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "googleurl/src/gurl.h"
-#include "webkit/fileapi/cross_file_util_helper.h"
 #include "webkit/fileapi/file_system_path.h"
 #include "webkit/fileapi/file_system_types.h"
 #include "webkit/fileapi/file_system_util.h"
 #include "webkit/quota/quota_types.h"
 
 namespace quota {
 class QuotaManagerProxy;
 }
 
 class FilePath;
@@ skipping 72 matching lines @@
   scoped_refptr<FileSystemContext> file_system_context_;
   const GURL origin_;
   const FileSystemType type_;
   FileSystemFileUtil* file_util_;
   int64 initial_usage_size_;
 };
 
 }  // namespace fileapi
 
 #endif  // WEBKIT_FILEAPI_FILE_SYSTEM_TEST_HELPER_H_