Cleanup: Remove fileapi::FileSystemMountPointProvider::InitializeCopyOrMoveFileValidatorFactory() a…

webkit/browser/fileapi/test_mount_point_provider.h

 // Copyright (c) 2012 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_BROWSER_FILEAPI_TEST_MOUNT_POINT_PROVIDER_H_
 #define WEBKIT_BROWSER_FILEAPI_TEST_MOUNT_POINT_PROVIDER_H_
 
 #include "base/files/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 30 matching lines @@
       bool create,
       const ValidateFileSystemCallback& callback) OVERRIDE;
   virtual base::FilePath GetFileSystemRootPathOnFileThread(
       const FileSystemURL& url,
       bool create) OVERRIDE;
   virtual FileSystemFileUtil* GetFileUtil(FileSystemType type) OVERRIDE;
   virtual AsyncFileUtil* GetAsyncFileUtil(FileSystemType type) OVERRIDE;
   virtual CopyOrMoveFileValidatorFactory* GetCopyOrMoveFileValidatorFactory(
       FileSystemType type,
       base::PlatformFileError* error_code) OVERRIDE;
-  virtual void InitializeCopyOrMoveFileValidatorFactory(
-      FileSystemType type,
-      scoped_ptr<CopyOrMoveFileValidatorFactory> factory) OVERRIDE;
   virtual FilePermissionPolicy GetPermissionPolicy(
       const FileSystemURL& url,
       int permissions) const OVERRIDE;
   virtual FileSystemOperation* CreateFileSystemOperation(
       const FileSystemURL& url,
       FileSystemContext* context,
       base::PlatformFileError* error_code) const OVERRIDE;
   virtual scoped_ptr<webkit_blob::FileStreamReader> CreateFileStreamReader(
       const FileSystemURL& url,
       int64 offset,
       const base::Time& expected_modification_time,
       FileSystemContext* context) const OVERRIDE;
   virtual scoped_ptr<FileStreamWriter> CreateFileStreamWriter(
       const FileSystemURL& url,
       int64 offset,
       FileSystemContext* context) const OVERRIDE;
   virtual FileSystemQuotaUtil* GetQuotaUtil() OVERRIDE;
   virtual void DeleteFileSystem(
       const GURL& origin_url,
       FileSystemType type,
       FileSystemContext* context,
       const DeleteFileSystemCallback& callback) OVERRIDE;
 
+  // Initialize the CopyOrMoveFileValidatorFactory. Invalid to call more than
+  // once.
+  virtual void InitializeCopyOrMoveFileValidatorFactory(
+      scoped_ptr<CopyOrMoveFileValidatorFactory> factory);

[kinuko, 2013/05/29 01:35:21]

nit: does this need to be virtual?

[Lei Zhang, 2013/05/29 01:37:21]

Nope, fixed.

+
   const UpdateObserverList* GetUpdateObservers(FileSystemType type) const;
 
   // For CopyOrMoveFileValidatorFactory testing. Once it's set to true
   // GetCopyOrMoveFileValidatorFactory will start returning security
   // error if validator is not initialized.
   void set_require_copy_or_move_validator(bool flag) {
     require_copy_or_move_validator_ = flag;
   }
 
  private:
   class QuotaUtil;
 
   base::FilePath base_path_;
   scoped_refptr<base::SequencedTaskRunner> task_runner_;
   scoped_ptr<AsyncFileUtilAdapter> local_file_util_;
   scoped_ptr<QuotaUtil> quota_util_;
   UpdateObserverList observers_;
 
   bool require_copy_or_move_validator_;
   scoped_ptr<CopyOrMoveFileValidatorFactory>
       copy_or_move_file_validator_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(TestMountPointProvider);
 };
 
 }  // namespace fileapi
 
 #endif  // WEBKIT_BROWSER_FILEAPI_TEST_MOUNT_POINT_PROVIDER_H_