Test cleanup: Using MockSpecialStoragePolicy instead of local subclasses of SpecialStoragePolicy.

webkit/fileapi/file_system_test_helper.cc

 // 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.
 
 #include "webkit/fileapi/file_system_test_helper.h"
 
 #include "base/file_util.h"
 #include "base/message_loop.h"
 #include "base/message_loop_proxy.h"
 #include "googleurl/src/gurl.h"
 #include "webkit/fileapi/file_system_context.h"
 #include "webkit/fileapi/file_system_operation.h"
 #include "webkit/fileapi/file_system_operation_context.h"
 #include "webkit/fileapi/file_system_usage_cache.h"
 #include "webkit/fileapi/file_system_util.h"
 #include "webkit/fileapi/sandbox_mount_point_provider.h"
-#include "webkit/quota/special_storage_policy.h"
+#include "webkit/quota/mock_special_storage_policy.h"
 
 namespace fileapi {
-namespace {
-
-class TestSpecialStoragePolicy : public quota::SpecialStoragePolicy {
- public:
-  explicit TestSpecialStoragePolicy(bool unlimited_quota)
-      : unlimited_quota_(unlimited_quota) {}
-
-  virtual bool IsStorageProtected(const GURL& origin) {
-    return false;
-  }
-
-  virtual bool IsStorageUnlimited(const GURL& origin) {
-    return unlimited_quota_;

[michaeln, 2011/08/12 18:53:52]

same question here, in some cases the test logic is explicit about a true return
value... now it will always get a false return value... seems like this changes
an aspect of the tests that may make a difference?

maybe the 'mock' impl could use a mode that return a canned value regardless of
the origin being asked about? that way we could use it in these tests w/o
changing the values seen when conductiing those tests?

[marja, 2011/08/16 10:54:25]

Done.

I thought it's FileSystemTestOriginHelper is never used with unlimited quota,
but I had overlooked FileWriterDelegateUnlimitedTest in unit_tests. I added the
"all unlimited" mode to the MockSpecialStoragePolicy, and made
FileSystemTestOriginHelper to set it.

-  }
-
-  virtual bool IsFileHandler(const std::string& extension_id) {

[marja, 2011/08/16 10:54:25]

And this was never called in unit_tests or test_shell_tests, so the "false"
return value of MockSpecialStoragePolicy shouldn't be a problem.

-    return true;
-  }
-
- private:
-  bool unlimited_quota_;
-};
-
-}  // anonymous namespace
 
 FileSystemTestOriginHelper::FileSystemTestOriginHelper(
     const GURL& origin, FileSystemType type)
     : origin_(origin), type_(type), file_util_(NULL) {
 }
 
 FileSystemTestOriginHelper::FileSystemTestOriginHelper()
     : origin_(GURL("http://foo.com")),
       type_(kFileSystemTypeTemporary),
       file_util_(NULL) {
@@ skipping 35 matching lines @@
     const FilePath& base_dir,
     bool incognito_mode,
     bool unlimited_quota,
     quota::QuotaManagerProxy* quota_manager_proxy,
     FileSystemFileUtil* file_util) {
   file_util_ = file_util;
   DCHECK(file_util_);
   file_system_context_ = new FileSystemContext(
       base::MessageLoopProxy::CreateForCurrentThread(),
       base::MessageLoopProxy::CreateForCurrentThread(),
-      new TestSpecialStoragePolicy(unlimited_quota),
+      new quota::MockSpecialStoragePolicy,
       quota_manager_proxy,
       base_dir,
       incognito_mode,
       true /* allow_file_access_from_files */,
       unlimited_quota,
       NULL);
 
   DCHECK(file_system_context_->path_manager());
   DCHECK(file_system_context_->path_manager()->sandbox_provider());
 
@@ skipping 92 matching lines @@
 void FileSystemTestOriginHelper::InitializeOperationContext(
     FileSystemOperationContext* context) {
   DCHECK(context);
   context->set_src_origin_url(origin_);
   context->set_src_type(type_);
   context->set_dest_origin_url(origin_);
   context->set_dest_type(type_);
 }
 
 }  // namespace fileapi