[Refactor] to rename and re-layer the file_util stack layers.

webkit/fileapi/file_system_operation_context.h

Index: webkit/fileapi/file_system_operation_context.h
diff --git a/webkit/fileapi/file_system_operation_context.h b/webkit/fileapi/file_system_operation_context.h
index 04f216cea7f25e6f853246754fdd141ce11e0d5d..4b919cba57abd525c790b71643f465778a7bb3ec 100644
--- a/webkit/fileapi/file_system_operation_context.h
+++ b/webkit/fileapi/file_system_operation_context.h
@@ -8,8 +8,8 @@
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "googleurl/src/gurl.h"
-#include "webkit/fileapi/file_system_file_util.h"
 #include "webkit/fileapi/file_system_types.h"
+#include "webkit/fileapi/fileapi_file_util.h"
 
 namespace fileapi {
 
@@ -17,34 +17,33 @@ class FileSystemContext;
 
 class FileSystemOperationContext {
  public:
-  // The |file_system_file_util| parameter is so that unit tests can force their
-  // own preferred class in for both src and dest FSFU; in general these will
-  // get set later by the FileSystemOperation.
-  FileSystemOperationContext(
-      FileSystemContext* context,
-      FileSystemFileUtil* file_system_file_util);
+  // The |file_util| parameter is so that unit tests can force their own
+  // preferred class in for both src and dest FSFU; in general these will get
+  // set later by the FileSystemOperation.
+  FileSystemOperationContext(FileSystemContext* context,
+                             FileApiFileUtil* file_util);
   ~FileSystemOperationContext();
 
   FileSystemContext* file_system_context() const {
     return file_system_context_.get();
   }
 
-  void set_src_file_system_file_util(FileSystemFileUtil* util) {
-    DCHECK(!src_file_system_file_util_);
-    src_file_system_file_util_ = util;
+  void set_src_file_util(FileApiFileUtil* util) {
+    DCHECK(!src_file_util_);
+    src_file_util_ = util;
   }
 
-  FileSystemFileUtil* src_file_system_file_util() const {
-    return src_file_system_file_util_;
+  FileApiFileUtil* src_file_util() const {
+    return src_file_util_;
   }
 
-  void set_dest_file_system_file_util(FileSystemFileUtil* util) {
-    DCHECK(!dest_file_system_file_util_);
-    dest_file_system_file_util_ = util;
+  void set_dest_file_util(FileApiFileUtil* util) {
+    DCHECK(!dest_file_util_);
+    dest_file_util_ = util;
   }
 
-  FileSystemFileUtil* dest_file_system_file_util() const {
-    return dest_file_system_file_util_;
+  FileApiFileUtil* dest_file_util() const {
+    return dest_file_util_;
   }
 
   void set_src_origin_url(const GURL& url) {
@@ -122,11 +121,10 @@ class FileSystemOperationContext {
 
  private:
   scoped_refptr<FileSystemContext> file_system_context_;
-  // These *_file_system_file_util_ are not "owned" by
-  // FileSystemOperationContext.  They are supposed to be pointers to objects
-  // that will outlive us.
-  FileSystemFileUtil* src_file_system_file_util_;
-  FileSystemFileUtil* dest_file_system_file_util_;
+  // These *_file_util_ are not "owned" by FileSystemOperationContext.  They
+  // are supposed to be pointers to objects that will outlive us.
+  FileApiFileUtil* src_file_util_;
+  FileApiFileUtil* dest_file_util_;
 
   GURL src_origin_url_;  // Also used for any single-path operation.
   GURL dest_origin_url_;