Cleanup: Reorder methods in SandboxMountPointProvider

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>
@@ skipping 31 matching lines @@
    public:
     virtual ~OriginEnumerator() {}
 
     // Returns the next origin.  Returns empty if there are no more origins.
     virtual GURL Next() = 0;
 
     // Returns the current origin's information.
     virtual bool HasFileSystemType(FileSystemType type) const = 0;
   };
 
-  SandboxMountPointProvider(
-      FileSystemPathManager* path_manager,
-      scoped_refptr<base::MessageLoopProxy> file_message_loop,
-      const FilePath& profile_path);
-  virtual ~SandboxMountPointProvider();
-
-  // Checks if access to |virtual_path| is allowed from |origin_url|.
-  virtual bool IsAccessAllowed(const GURL& origin_url,
-                               FileSystemType type,
-                               const FilePath& virtual_path) OVERRIDE;
-
-  // Retrieves the root path for the given |origin_url| and |type|, and
-  // calls the given |callback| with the root path and name.
-  // If |create| is true this also creates the directory if it doesn't exist.
-  virtual void ValidateFileSystemRootAndGetURL(
-      const GURL& origin_url,
-      FileSystemType type,
-      bool create,
-      const FileSystemPathManager::GetRootPathCallback& callback) OVERRIDE;
-
-  // Like GetFileSystemRootPath, but synchronous, and can be called only while
-  // running on the file thread.
-  virtual FilePath ValidateFileSystemRootAndGetPathOnFileThread(
-      const GURL& origin_url,
-      FileSystemType type,
-      const FilePath& unused,
-      bool create) OVERRIDE;
-
   // The legacy [pre-obfuscation] FileSystem directory name, kept around for
   // migration and migration testing.
   static const FilePath::CharType kOldFileSystemDirectory[];
   // The FileSystem directory name.
   static const FilePath::CharType kNewFileSystemDirectory[];
   // Where we move the old filesystem directory if migration fails.
   static const FilePath::CharType kRenamedOldFileSystemDirectory[];
 
+  SandboxMountPointProvider(
+      FileSystemPathManager* path_manager,
+      scoped_refptr<base::MessageLoopProxy> file_message_loop,
+      const FilePath& profile_path);
+  virtual ~SandboxMountPointProvider();
+
+  // FileSystemMountPointProvider overrides.
+  virtual bool IsAccessAllowed(const GURL& origin_url,
+                               FileSystemType type,
+                               const FilePath& virtual_path) OVERRIDE;
+  virtual void ValidateFileSystemRootAndGetURL(
+      const GURL& origin_url,
+      FileSystemType type,
+      bool create,
+      const FileSystemPathManager::GetRootPathCallback& callback) OVERRIDE;
+  virtual FilePath ValidateFileSystemRootAndGetPathOnFileThread(
+      const GURL& origin_url,
+      FileSystemType type,
+      const FilePath& unused,
+      bool create) OVERRIDE;
+  virtual bool IsRestrictedFileName(const FilePath& filename) const OVERRIDE;
+  virtual std::vector<FilePath> GetRootDirectories() const OVERRIDE;
+  virtual FileSystemFileUtil* GetFileUtil() OVERRIDE;
+
   FilePath old_base_path() const;
   FilePath new_base_path() const;
   FilePath renamed_old_base_path() const;
 
-  // Checks if a given |name| contains any restricted names/chars in it.
-  virtual bool IsRestrictedFileName(const FilePath& filename) const OVERRIDE;
-
-  virtual std::vector<FilePath> GetRootDirectories() const OVERRIDE;
-
   // Returns an origin enumerator of this provider.
   // This method can only be called on the file thread.
   OriginEnumerator* CreateOriginEnumerator() const;
 
   // Gets a base directory path of the sandboxed filesystem that is
   // 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* GetFileUtil() OVERRIDE;
-
   // 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(
       FileSystemType type,
@@ skipping 52 matching lines @@
 
   // 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_