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

webkit/fileapi/file_system_test_helper.cc

Index: webkit/fileapi/file_system_test_helper.cc
diff --git a/webkit/fileapi/file_system_test_helper.cc b/webkit/fileapi/file_system_test_helper.cc
index dd5bfa45abfad4bda6cad02eb31ab967931362e6..94f06867fdf20e317c90f7a90be57f1cbcb0ea78 100644
--- a/webkit/fileapi/file_system_test_helper.cc
+++ b/webkit/fileapi/file_system_test_helper.cc
@@ -14,33 +14,9 @@
 #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)
@@ -96,7 +72,7 @@ void FileSystemTestOriginHelper::SetUp(
   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,