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

webkit/fileapi/sandbox_mount_point_provider_unittest.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/sandbox_mount_point_provider.h"
 
 #include <set>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/file_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_callback_factory.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/message_loop_proxy.h"
 #include "base/platform_file.h"
 #include "base/scoped_temp_dir.h"
 #include "googleurl/src/gurl.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/fileapi/file_system_context.h"
 #include "webkit/fileapi/file_system_operation_context.h"
 #include "webkit/fileapi/file_system_path_manager.h"
 #include "webkit/fileapi/file_system_util.h"
+#include "webkit/quota/mock_special_storage_policy.h"
 
 namespace fileapi {
 
 class MockFileSystemPathManager : public FileSystemPathManager {
  public:
   explicit MockFileSystemPathManager(const FilePath& profile_path)
       : FileSystemPathManager(base::MessageLoopProxy::CreateForCurrentThread(),
                               profile_path, NULL, false, true) {}
 };
 
@@ skipping 85 matching lines @@
 
 const MigrationTestCaseRecord kMigrationTestRecords[] = {
   { GURL("http://www.example.com"), true, false },
   { GURL("http://example.com"), false, true },
   { GURL("http://www.google.com"), false, true },
   { GURL("http://www.another.origin.com"), true, true },
   { GURL("http://www.yet.another.origin.com"), true, true },
   { GURL("file:///"), false, true },
 };
 
-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_;
-  }
-
-  virtual bool IsFileHandler(const std::string& extension_id) {
-    return true;
-  }
-
- private:
-  bool unlimited_quota_;
-};
-
 }  // anonymous namespace
 
 class SandboxMountPointProviderMigrationTest : public testing::Test {
  public:
   SandboxMountPointProviderMigrationTest() :
       ALLOW_THIS_IN_INITIALIZER_LIST(callback_factory_(this)) {
   }
 
   void SetUp() {
     ASSERT_TRUE(data_dir_.CreateUniqueTempDir());
     path_manager_ = new MockFileSystemPathManager(data_dir_.path());
 
     file_system_context_ = new FileSystemContext(
         base::MessageLoopProxy::CreateForCurrentThread(),
         base::MessageLoopProxy::CreateForCurrentThread(),
-        new TestSpecialStoragePolicy(true /* unlimited quota */),

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

I changed this to use the "all unlimited" mode of MockSpecialStoragePolicy, too.

+        new quota::MockSpecialStoragePolicy,
         NULL,
         data_dir_.path(),
         false,  // incognito
         true,  // allow_file_access_from_files
         true,  // unlimited quota
         path_manager_);
   }
 
   FileSystemPathManager* path_manager() {
     return path_manager_;
@@ skipping 239 matching lines @@
 
 TEST_F(SandboxMountPointProviderMigrationTest, TestMigrateViaMethod8) {
   RunMigrationTest(8);
 }
 
 TEST_F(SandboxMountPointProviderMigrationTest, TestMigrateViaMethod9) {
   RunMigrationTest(9);
 }
 
 }  // namespace fileapi