BrowsingDataRemover, (re)use StoragePartition deletion code.

content/public/browser/storage_partition.h

 // 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.
 
 #ifndef CONTENT_PUBLIC_BROWSER_STORAGE_PARTITION_H_
 #define CONTENT_PUBLIC_BROWSER_STORAGE_PARTITION_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/files/file_path.h"
 
 class GURL;
 
 namespace appcache {
 class AppCacheService;
 }
 
 namespace fileapi {
 class FileSystemContext;
 }
 
 namespace net {
 class URLRequestContextGetter;
 }
 
 namespace quota {
 class QuotaManager;
+class SpecialStoragePolicy;
 }
 
 namespace webkit_database {
 class DatabaseTracker;
 }
 
 namespace content {
 
 class BrowserContext;
 class IndexedDBContext;
 class DOMStorageContext;
 
 // Defines what persistent state a child process can access.
 //
 // The StoragePartition defines the view each child process has of the
 // persistent state inside the BrowserContext. This is used to implement
 // isolated storage where a renderer with isolated storage cannot see
 // the cookies, localStorage, etc., that normal web renderers have access to.
 class StoragePartition {
  public:
+  // A callback type to check if a given origin matches a storage policy.
+  // Can be passed empty/null where used, which means the origin will always
+  // match.
+  typedef base::Callback<bool(const GURL&,
+                              quota::SpecialStoragePolicy*)>
+      OriginMatcherFunction;

[jam, 2013/10/31 00:06:05]

nit: move this to line 108, convention for content api is that every callback
typedef is right above the method which uses it

[lazyboy, 2013/10/31 20:55:30]

Done.

+
   virtual base::FilePath GetPath() = 0;
   virtual net::URLRequestContextGetter* GetURLRequestContext() = 0;
   virtual net::URLRequestContextGetter* GetMediaURLRequestContext() = 0;
   virtual quota::QuotaManager* GetQuotaManager() = 0;
   virtual appcache::AppCacheService* GetAppCacheService() = 0;
   virtual fileapi::FileSystemContext* GetFileSystemContext() = 0;
   virtual webkit_database::DatabaseTracker* GetDatabaseTracker() = 0;
   virtual DOMStorageContext* GetDOMStorageContext() = 0;
   virtual IndexedDBContext* GetIndexedDBContext() = 0;
 
@@ skipping 31 matching lines @@
   // TODO(ajwong): Right now, the embedder may have some
   // URLRequestContextGetter objects that the StoragePartition does not know
   // about.  This will no longer be the case when we resolve
   // http://crbug.com/159193. Remove |request_context_getter| when that bug
   // is fixed.
   virtual void ClearDataForOrigin(uint32 remove_mask,
                                   uint32 quota_storage_remove_mask,
                                   const GURL& storage_origin,
                                   net::URLRequestContextGetter* rq_context) = 0;
 
-  // Similar to ClearDataForOrigin(), but deletes all data out of the
-  // StoragePartition rather than just the data related to this origin.
-  virtual void ClearDataForUnboundedRange(uint32 remove_mask,
-                                          uint32 quota_storage_remove_mask) = 0;
-
-  // Similar to ClearDataForOrigin(), but deletes all the data out of the
-  // StoragePartion from between the given |begin| and |end| dates rather
-  // then just the data related to this origin.
-  virtual void ClearDataForRange(uint32 remove_mask,
-                                 uint32 quota_storage_remove_mask,
-                                 const base::Time& begin,
-                                 const base::Time& end,
-                                 const base::Closure& callback) = 0;
+  // Similar to ClearDataForOrigin().
+  // Deletes all data out fo the StoragePartition if |storage_origin| is NULL.
+  // |origin_matcher| is present if special storage policy is to be handled,
+  // otherwise the callback can be null (base::Callback::is_null() == true).
+  // |callback| is called when data deletion is done or at least the deletion is
+  // scheduled.
+  virtual void ClearData(uint32 remove_mask,
+                         uint32 quota_storage_remove_mask,
+                         const GURL* storage_origin,
+                         const OriginMatcherFunction& origin_matcher,
+                         const base::Time begin,
+                         const base::Time end,
+                         const base::Closure& callback) = 0;
 
  protected:
   virtual ~StoragePartition() {}
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_BROWSER_STORAGE_PARTITION_H_