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

webkit/fileapi/sandbox_mount_point_provider.h

 // Copyright (c) 2011 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_SANDBOX_MOUNT_POINT_PROVIDER_H_
 #define WEBKIT_FILEAPI_SANDBOX_MOUNT_POINT_PROVIDER_H_
 
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/file_path.h"
 #include "base/memory/scoped_ptr.h"
 #include "googleurl/src/gurl.h"
 #include "webkit/fileapi/file_system_mount_point_provider.h"
 #include "webkit/fileapi/file_system_quota_util.h"
 
 namespace base {
 class MessageLoopProxy;
 }
 
 namespace quota {
 class QuotaManagerProxy;
 }
 
 namespace fileapi {
 
-class ObfuscatedFileSystemFileUtil;
+class ObfuscatedFileUtil;
 
 // An interface to construct or crack sandboxed filesystem paths.
 // Currently each sandboxed filesystem path looks like (soon will be changed):
 //   <profile_dir>/FileSystem/<origin_identifier>/<type>/chrome-<unique>/...
 // <type> is either one of "Temporary" or "Persistent".
 class SandboxMountPointProvider
     : public FileSystemMountPointProvider,
       public FileSystemQuotaUtil {
  public:
   // Origin enumerator interface.
@@ skipping 62 matching lines @@
   // specified by |origin_url| and |type|.
   // (The path is similar to the origin's root path but doesn't contain
   // the 'unique' part.)
   // Returns an empty path if the given type is invalid.
   // This method can only be called on the file thread.
   FilePath GetBaseDirectoryForOriginAndType(
       const GURL& origin_url,
       FileSystemType type,
       bool create) const;
 
-  virtual FileSystemFileUtil* GetFileSystemFileUtil();
+  virtual FileSystemFileUtil* GetFileUtil();
 
   // Deletes the data on the origin and reports the amount of deleted data
   // to the quota manager via |proxy|.
   bool DeleteOriginDataOnFileThread(
       quota::QuotaManagerProxy* proxy,
       const GURL& origin_url,
       FileSystemType type);
 
   // Quota util methods.
   virtual void GetOriginsForTypeOnFileThread(
@@ skipping 42 matching lines @@
   friend class SandboxMountPointProviderOriginEnumeratorTest;
 
   // The path_manager_ isn't owned by this instance; this instance is owned by
   // the path_manager_, and they have the same lifetime.
   FileSystemPathManager* path_manager_;
 
   scoped_refptr<base::MessageLoopProxy> file_message_loop_;
 
   const FilePath profile_path_;
 
-  scoped_refptr<ObfuscatedFileSystemFileUtil> sandbox_file_util_;
+  scoped_refptr<ObfuscatedFileUtil> sandbox_file_util_;
 
   // Acccessed only on the file thread.
   std::set<GURL> visited_origins_;
 
   DISALLOW_COPY_AND_ASSIGN(SandboxMountPointProvider);
 };
 
 }  // namespace fileapi
 
 #endif  // WEBKIT_FILEAPI_SANDBOX_MOUNT_POINT_PROVIDER_H_