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

webkit/fileapi/file_system_operation.h

Index: webkit/fileapi/file_system_operation.h
diff --git a/webkit/fileapi/file_system_operation.h b/webkit/fileapi/file_system_operation.h
index f6835b0f66ac3a076849cbe5b1acce34a8c5399a..8ce5aa41d8a280260f5ad41fbb745e05ea2803c9 100644
--- a/webkit/fileapi/file_system_operation.h
+++ b/webkit/fileapi/file_system_operation.h
@@ -48,12 +48,12 @@ class FileSystemOperationTest;
 class FileSystemOperation {
  public:
   // |dispatcher| will be owned by this class.
-  // |file_system_file_util| is optional; if supplied, it will not be deleted by
+  // |file_util| is optional; if supplied, it will not be deleted by
   // the class.  It's expecting a pointer to a singleton.
   FileSystemOperation(FileSystemCallbackDispatcher* dispatcher,
                       scoped_refptr<base::MessageLoopProxy> proxy,
                       FileSystemContext* file_system_context,
-                      FileSystemFileUtil* file_system_file_util);
+                      FileUtil* file_util);
   virtual ~FileSystemOperation();
 
   void OpenFileSystem(const GURL& origin_url,
@@ -171,7 +171,7 @@ class FileSystemOperation {
 
   // Checks the validity of a given |path| for reading, cracks the path into
   // root URL and virtual path components, and returns the correct
-  // FileSystemFileUtil subclass for this type.
+  // FileUtil subclass for this type.
   // Returns true if the given |path| is a valid FileSystem path.
   // Otherwise it calls dispatcher's DidFail method with
   // PLATFORM_FILE_ERROR_SECURITY and returns false.
@@ -181,11 +181,11 @@ class FileSystemOperation {
                                    GURL* root_url,
                                    FileSystemType* type,
                                    FilePath* virtual_path,
-                                   FileSystemFileUtil** file_system_file_util);
+                                   FileUtil** file_util);
 
   // Checks the validity of a given |path| for writing, cracks the path into
   // root URL and virtual path components, and returns the correct
-  // FileSystemFileUtil subclass for this type.
+  // FileUtil subclass for this type.
   // Returns true if the given |path| is a valid FileSystem path, and
   // its origin embedded in the path has the right to write.
   // Otherwise it fires dispatcher's DidFail method with
@@ -203,7 +203,7 @@ class FileSystemOperation {
                                     GURL* root_url,
                                     FileSystemType* type,
                                     FilePath* virtual_path,
-                                    FileSystemFileUtil** file_system_file_util);
+                                    FileUtil** file_util);
 
 #ifndef NDEBUG
   enum OperationType {