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

webkit/browser/fileapi/test_file_system_backend.cc

 // 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.
 
 #include "webkit/browser/fileapi/test_file_system_backend.h"
 
 #include <set>
 #include <string>
 #include <vector>
 
@@ skipping 167 matching lines @@
   if (require_copy_or_move_validator_) {
     if (!copy_or_move_file_validator_factory_)
       *error_code = base::PLATFORM_FILE_ERROR_SECURITY;
     return copy_or_move_file_validator_factory_.get();
   }
   return NULL;
 }
 
 void TestFileSystemBackend::InitializeCopyOrMoveFileValidatorFactory(
     scoped_ptr<CopyOrMoveFileValidatorFactory> factory) {
-  // What purpose is this check serving?
-  if (!require_copy_or_move_validator_) {
-    DCHECK(!factory);
-    return;
-  }
   if (!copy_or_move_file_validator_factory_)
     copy_or_move_file_validator_factory_ = factory.Pass();
 }
 
+void TestFileSystemBackend::ResetCopyOrMoveFileValidatorFactory() {
+  copy_or_move_file_validator_factory_.reset();
+}
+
 FileSystemOperation* TestFileSystemBackend::CreateFileSystemOperation(
     const FileSystemURL& url,
     FileSystemContext* context,
     base::PlatformFileError* error_code) const {
   scoped_ptr<FileSystemOperationContext> operation_context(
       new FileSystemOperationContext(context));
   operation_context->set_update_observers(*GetUpdateObservers(url.type()));
   operation_context->set_change_observers(
       *quota_util_->GetChangeObservers(url.type()));
   operation_context->set_root_path(base_path_);
@@ skipping 30 matching lines @@
   return quota_util_->GetUpdateObservers(type);
 }
 
 void TestFileSystemBackend::AddFileChangeObserver(
     FileChangeObserver* observer) {
   quota_util_->AddFileChangeObserver(
       kFileSystemTypeTest, observer, quota_util_->task_runner());
 }
 
 }  // namespace fileapi