[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 faa14d5877f926ef7ab638d7728caa1b14673667..f14df9c7a39d7647d41931fc2295e2fca6e7e6b7 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);
+                      FileSystemFileUtil* file_util);
   virtual ~FileSystemOperation();
 
   void OpenFileSystem(const GURL& origin_url,
@@ -181,7 +181,7 @@ class FileSystemOperation {
                                    GURL* root_url,
                                    FileSystemType* type,
                                    FilePath* virtual_path,
-                                   FileSystemFileUtil** file_system_file_util);
+                                   FileSystemFileUtil** 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
@@ -203,7 +203,7 @@ class FileSystemOperation {
                                     GURL* root_url,
                                     FileSystemType* type,
                                     FilePath* virtual_path,
-                                    FileSystemFileUtil** file_system_file_util);
+                                    FileSystemFileUtil** file_util);
 
 #ifndef NDEBUG
   enum OperationType {