Fix up some tests for copy-or-move validator and nearby.

webkit/browser/fileapi/test_file_system_backend.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_FILE_SYSTEM_BACKEND_H_
 #define WEBKIT_BROWSER_FILEAPI_TEST_FILE_SYSTEM_BACKEND_H_
 
 #include "base/files/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 48 matching lines @@
       const FileSystemURL& url,
       int64 offset,
       FileSystemContext* context) const OVERRIDE;
   virtual FileSystemQuotaUtil* GetQuotaUtil() OVERRIDE;
 
   // Initialize the CopyOrMoveFileValidatorFactory. Invalid to call more than
   // once.
   void InitializeCopyOrMoveFileValidatorFactory(
       scoped_ptr<CopyOrMoveFileValidatorFactory> factory);
 
+  // Reset the CopyOrMoveFileValidatorFactory to empty.

[vandebo (ex-Chrome), 2013/07/31 22:43:23]

Not used.

[Greg Billock, 2013/08/01 16:23:05]

Done.

+  void ResetCopyOrMoveFileValidatorFactory();
+
   const UpdateObserverList* GetUpdateObservers(FileSystemType type) const;
   void AddFileChangeObserver(FileChangeObserver* observer);
 
   // 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_;
 
   bool require_copy_or_move_validator_;
   scoped_ptr<CopyOrMoveFileValidatorFactory>
       copy_or_move_file_validator_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(TestFileSystemBackend);
 };
 
 }  // namespace fileapi
 
 #endif  // WEBKIT_BROWSER_FILEAPI_TEST_FILE_SYSTEM_BACKEND_H_