BrowsingDataRemover, (re)use StoragePartition deletion code.

chrome/browser/browsing_data/browsing_data_remover.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 CHROME_BROWSER_BROWSING_DATA_BROWSING_DATA_REMOVER_H_
 #define CHROME_BROWSER_BROWSING_DATA_BROWSING_DATA_REMOVER_H_
 
 #include <set>
 
 #include "base/gtest_prod_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/observer_list.h"
 #include "base/prefs/pref_member.h"
 #include "base/sequenced_task_runner_helpers.h"
 #include "base/synchronization/waitable_event_watcher.h"
 #include "base/time/time.h"
 #include "chrome/browser/pepper_flash_settings_manager.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/common/cancelable_task_tracker.h"
 #include "url/gurl.h"
 #include "webkit/common/quota/quota_types.h"
 
 class ExtensionSpecialStoragePolicy;
 class IOThread;
 class Profile;
 
 namespace content {
 class PluginDataRemover;
+class StoragePartition;
 }
 
 namespace disk_cache {
 class Backend;
 }
 
 namespace net {
 class URLRequestContextGetter;
 }
 
@@ skipping 109 matching lines @@
 
   // Creates a BrowsingDataRemover bound to a specific period of time (as
   // defined via a TimePeriod). Returns a raw pointer, as BrowsingDataRemover
   // retains ownership of itself, and deletes itself once finished.
   static BrowsingDataRemover* CreateForPeriod(Profile* profile,
                                               TimePeriod period);
 
   // Calculate the begin time for the deletion range specified by |time_period|.
   static base::Time CalculateBeginDeleteTime(TimePeriod time_period);
 
-  // Quota managed data uses a different bitmask for types than
-  // BrowsingDataRemover uses. This method generates that mask.
-  static int GenerateQuotaClientMask(int remove_mask);
-
   // Is the BrowsingDataRemover currently in the process of removing data?
   static bool is_removing() { return is_removing_; }
 
   // Removes the specified items related to browsing for all origins that match
   // the provided |origin_set_mask| (see BrowsingDataHelper::OriginSetMask).
   void Remove(int remove_mask, int origin_set_mask);
 
   void AddObserver(Observer* observer);
   void RemoveObserver(Observer* observer);
 
   // Called when history deletion is done.
   void OnHistoryDeletionDone();
 
   // Used for testing.
-  void OverrideQuotaManagerForTesting(quota::QuotaManager* quota_manager);
+  void OverrideStoragePartitionForTesting(
+      content::StoragePartition* storage_partition);
 
  private:
   // The clear API needs to be able to toggle removing_ in order to test that
   // only one BrowsingDataRemover instance can be called at a time.
   FRIEND_TEST_ALL_PREFIXES(ExtensionBrowsingDataTest, OneAtATime);
 
   // The BrowsingDataRemover tests need to be able to access the implementation
   // of Remove(), as it exposes details that aren't yet available in the public
   // API. As soon as those details are exposed via new methods, this should be
   // removed.
@@ skipping 103 matching lines @@
   // NotifyAndDeleteIfDone.
   void ClearedPnaclCache();
 
   // Invokes ClearedPnaclCacheOn on the UI thread.
   void ClearedPnaclCacheOnIOThread();
 
   // Invoked on the IO thread to delete entries in the PNaCl translation cache.
   void ClearPnaclCacheOnIOThread(base::Time begin, base::Time end);
 #endif
 
-  // Invoked on the UI thread to delete local storage.
-  void ClearLocalStorageOnUIThread();
-
-  // Callback to deal with the list gathered in ClearLocalStorageOnUIThread.
-  void OnGotLocalStorageUsageInfo(
-      const std::vector<content::LocalStorageUsageInfo>& infos);
-
-  // Invoked on the UI thread to delete session storage.
-  void ClearSessionStorageOnUIThread();
-
-  // Callback to deal with the list gathered in ClearSessionStorageOnUIThread.
-  void OnGotSessionStorageUsageInfo(
-      const std::vector<content::SessionStorageUsageInfo>& infos);
-
-  // Invoked on the IO thread to delete all storage types managed by the quota
-  // system: AppCache, Databases, FileSystems.
-  void ClearQuotaManagedDataOnIOThread();
-
-  // Callback to respond to QuotaManager::GetOriginsModifiedSince, which is the
-  // core of 'ClearQuotaManagedDataOnIOThread'.
-  void OnGotQuotaManagedOrigins(const std::set<GURL>& origins,
-                                quota::StorageType type);
-
-  // Callback responding to deletion of a single quota managed origin's
-  // persistent data
-  void OnQuotaManagedOriginDeletion(const GURL& origin,
-                                    quota::StorageType type,
-                                    quota::QuotaStatusCode);
-
-  // Called to check whether all temporary and persistent origin data that
-  // should be deleted has been deleted. If everything's good to go, invokes
-  // OnQuotaManagedDataDeleted on the UI thread.
-  void CheckQuotaManagedDataDeletionStatus();
-
-  // Completion handler that runs on the UI thread once persistent data has been
-  // deleted. Updates the waiting flag and invokes NotifyAndDeleteIfDone.
-  void OnQuotaManagedDataDeleted();
-
   // Callback for when Cookies has been deleted. Invokes NotifyAndDeleteIfDone.
   void OnClearedCookies(int num_deleted);
 
   // Invoked on the IO thread to delete cookies.
   void ClearCookiesOnIOThread(net::URLRequestContextGetter* rq_context);
 
   // Invoked on the IO thread to delete server bound certs.
   void ClearServerBoundCertsOnIOThread(
       net::URLRequestContextGetter* rq_context);
 
   // Callback on IO Thread when server bound certs have been deleted. Clears SSL
   // connection pool and posts to UI thread to run OnClearedServerBoundCerts.
   void OnClearedServerBoundCertsOnIOThread(
       net::URLRequestContextGetter* rq_context);
 
   // Callback for when server bound certs have been deleted. Invokes
   // NotifyAndDeleteIfDone.
   void OnClearedServerBoundCerts();
 
   // Callback from the above method.
   void OnClearedFormData();
 
   // Callback for when the Autofill profile and credit card origin URLs have
   // been deleted.
   void OnClearedAutofillOriginURLs();
 
-  // Callback for when the shader cache has been deleted.
-  // Invokes NotifyAndDeleteIfDone.
-  void ClearedShaderCache();
 
-  // Invoked on the IO thread to delete from the shader cache.
-  void ClearShaderCacheOnUIThread();
-
-  // Callback on UI thread when the WebRTC identities are cleared.
-  void OnClearWebRTCIdentityStore();
+  // Callback on UI thread when the storage partition related data are cleared.
+  void OnClearedStoragePartitionData();
 
   // Returns true if we're all done.
   bool AllDone();
 
   // Profile we're to remove from.
   Profile* profile_;
 
-  // The QuotaManager is owned by the profile; we can use a raw pointer here,
-  // and rely on the profile to destroy the object whenever it's reasonable.
-  quota::QuotaManager* quota_manager_;
-
-  // The DOMStorageContext is owned by the profile; we'll store a raw pointer.
-  content::DOMStorageContext* dom_storage_context_;
-
   // 'Protected' origins are not subject to data removal.
   scoped_refptr<ExtensionSpecialStoragePolicy> special_storage_policy_;
 
   // Start time to delete from.
   const base::Time delete_begin_;
 
   // End time to delete to.
   base::Time delete_end_;
 
   // True if Remove has been invoked.
@@ skipping 19 matching lines @@
   // True if we're waiting for various data to be deleted.
   // These may only be accessed from UI thread in order to avoid races!
   bool waiting_for_clear_autofill_origin_urls_;
   bool waiting_for_clear_cache_;
   bool waiting_for_clear_content_licenses_;
   // Non-zero if waiting for cookies to be cleared.
   int waiting_for_clear_cookies_count_;
   bool waiting_for_clear_form_;
   bool waiting_for_clear_history_;
   bool waiting_for_clear_hostname_resolution_cache_;
-  bool waiting_for_clear_local_storage_;
+  bool waiting_for_clear_keyword_data_;
   bool waiting_for_clear_logged_in_predictor_;
   bool waiting_for_clear_nacl_cache_;
   bool waiting_for_clear_network_predictor_;
   bool waiting_for_clear_networking_history_;
   bool waiting_for_clear_plugin_data_;
   bool waiting_for_clear_pnacl_cache_;
   bool waiting_for_clear_quota_managed_data_;
   bool waiting_for_clear_server_bound_certs_;
-  bool waiting_for_clear_session_storage_;
-  bool waiting_for_clear_shader_cache_;
-  bool waiting_for_clear_webrtc_identity_store_;
-  bool waiting_for_clear_keyword_data_;
-
-  // Tracking how many origins need to be deleted, and whether we're finished
-  // gathering origins.
-  int quota_managed_origins_to_delete_count_;
-  int quota_managed_storage_types_to_delete_count_;
+  bool waiting_for_clear_storage_partition_data_;
 
   // The removal mask for the current removal operation.
   int remove_mask_;
 
   // The origin for the current removal operation.
   GURL remove_origin_;
 
   // From which types of origins should we remove data?
   int origin_set_mask_;
 
   ObserverList<Observer> observer_list_;
 
   // Used if we need to clear history.
   CancelableTaskTracker history_task_tracker_;
 
   scoped_ptr<TemplateURLService::Subscription> template_url_sub_;
 
+  // We do not own this.
+  content::StoragePartition* storage_partition_for_testing_;
+
   DISALLOW_COPY_AND_ASSIGN(BrowsingDataRemover);
 };
 
 #endif  // CHROME_BROWSER_BROWSING_DATA_BROWSING_DATA_REMOVER_H_