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

webkit/fileapi/file_system_dir_url_request_job_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.
 //
 // NOTE: These tests are run as part of "unit_tests" (in chrome/test/unit)
 // rather than as part of test_shell_tests because they rely on being able
 // to instantiate a MessageLoop of type TYPE_IO.  test_shell_tests uses
 // TYPE_UI, which URLRequest doesn't allow.
 //
 
@@ skipping 15 matching lines @@
 #include "net/http/http_request_headers.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "unicode/regex.h"
 #include "webkit/fileapi/file_system_context.h"
 #include "webkit/fileapi/file_system_file_util.h"
 #include "webkit/fileapi/file_system_operation_context.h"
 #include "webkit/fileapi/file_system_path_manager.h"
 #include "webkit/fileapi/sandbox_mount_point_provider.h"
+#include "webkit/quota/mock_special_storage_policy.h"
 
 namespace fileapi {
 namespace {
 
 // We always use the TEMPORARY FileSystem in this test.
 static const char kFileSystemURLPrefix[] =
     "filesystem:http://remote/temporary/";
 
-class TestSpecialStoragePolicy : public quota::SpecialStoragePolicy {
- public:
-  virtual bool IsStorageProtected(const GURL& origin) {
-    return false;
-  }
-
-  virtual bool IsStorageUnlimited(const GURL& origin) {
-    return true;

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

The old impl claimed all origins were unlimited (and were also fileHandlers)...
the new impl will return false all. I guess the tests don't depend on the 'true'
return values? Is that right?

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

IsStorageUnlimited and IsFileHandler in this file were never called when
executing FileSystemDirURLRequestJobTest.

-  }
-
-  virtual bool IsFileHandler(const std::string& extension_id) {
-    return true;
-  }
-};
-
 }  // namespace
 
 class FileSystemDirURLRequestJobTest : public testing::Test {
  protected:
   FileSystemDirURLRequestJobTest()
     : message_loop_(MessageLoop::TYPE_IO),  // simulate an IO thread
       ALLOW_THIS_IN_INITIALIZER_LIST(callback_factory_(this)) {
   }
 
   virtual void SetUp() {
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
 
     file_thread_proxy_ = base::MessageLoopProxy::CreateForCurrentThread();
 
-    special_storage_policy_ = new TestSpecialStoragePolicy();
+    special_storage_policy_ = new quota::MockSpecialStoragePolicy;
     file_system_context_ =
         new FileSystemContext(
             base::MessageLoopProxy::CreateForCurrentThread(),
             base::MessageLoopProxy::CreateForCurrentThread(),
             special_storage_policy_, NULL,
             FilePath(), false /* is_incognito */,
             false, true,
             new FileSystemPathManager(
                     file_thread_proxy_, temp_dir_.path(),
                     NULL, false, false));
@@ skipping 139 matching lines @@
   // Put the message loop at the top, so that it's the last thing deleted.
   MessageLoop message_loop_;
   // Delete all MessageLoopProxy objects before the MessageLoop, to help prevent
   // leaks caused by tasks posted during shutdown.
   scoped_refptr<base::MessageLoopProxy> file_thread_proxy_;
 
   ScopedTempDir temp_dir_;
   FilePath root_path_;
   scoped_ptr<net::URLRequest> request_;
   scoped_ptr<TestDelegate> delegate_;
-  scoped_refptr<TestSpecialStoragePolicy> special_storage_policy_;
+  scoped_refptr<quota::MockSpecialStoragePolicy> special_storage_policy_;
   scoped_refptr<FileSystemContext> file_system_context_;
   base::ScopedCallbackFactory<FileSystemDirURLRequestJobTest> callback_factory_;
 
   static net::URLRequestJob* job_;
 };
 
 // static
 net::URLRequestJob* FileSystemDirURLRequestJobTest::job_ = NULL;
 
 namespace {
@@ skipping 66 matching lines @@
   MessageLoop::current()->PostTask(FROM_HERE, new QuitNowTask);
   MessageLoop::current()->Run();
 
   request_.reset();
   MessageLoop::current()->RunAllPending();
   // If we get here, success! we didn't crash!
 }
 
 }  // namespace (anonymous)
 }  // namespace fileapi