Teaching BrowsingDataRemover how to delete application data.

chrome/browser/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_REMOVER_H_
 #define CHROME_BROWSER_BROWSING_DATA_REMOVER_H_
 #pragma once
 
 #include <set>
 
@@ skipping 64 matching lines @@
     REMOVE_SERVER_BOUND_CERTS = 1 << 12,
 
     // "Site data" includes cookies, appcache, file systems, indexedDBs, local
     // storage, webSQL, and plugin data.
     REMOVE_SITE_DATA = REMOVE_APPCACHE | REMOVE_COOKIES | REMOVE_FILE_SYSTEMS |
                        REMOVE_INDEXEDDB | REMOVE_LOCAL_STORAGE |
                        REMOVE_PLUGIN_DATA | REMOVE_WEBSQL |
                        REMOVE_SERVER_BOUND_CERTS
   };
 
+  enum OriginSetMask {
+    UNPROTECTED_WEB = 1 << 0,
+    PROTECTED_WEB = 1 << 1,
+    EXTENSION = 1 << 2
+  };
+
   // When BrowsingDataRemover successfully removes data, a notification of type
   // NOTIFICATION_BROWSING_DATA_REMOVED is triggered with a Details object of
   // this type.
   struct NotificationDetails {
     NotificationDetails();
     NotificationDetails(const NotificationDetails& details);
     NotificationDetails(base::Time removal_begin,
                        int removal_mask);
     ~NotificationDetails();
 
@@ skipping 17 matching lines @@
   // Creates a BrowsingDataRemover to remove browser data from the specified
   // profile in the specified time range. Use Remove to initiate the removal.
   BrowsingDataRemover(Profile* profile, base::Time delete_begin,
                       base::Time delete_end);
 
   // Creates a BrowsingDataRemover to remove browser data from the specified
   // profile in the specified time range.
   BrowsingDataRemover(Profile* profile, TimePeriod time_period,
                       base::Time delete_end);
 
-  // Removes the specified items related to browsing for all origins.
-  void Remove(int remove_mask);
+  // Removes the specified items related to browsing for all origins that match
+  // the provided |origin_set_mask| (protected, unprotected, or both).
+  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();
 
   // Quota managed data uses a different bitmask for types than
   // BrowsingDataRemover uses. This method generates that mask.
   static int GenerateQuotaClientMask(int remove_mask);
@@ skipping 38 matching lines @@
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
   // WaitableEventWatcher implementation.
   // Called when plug-in data has been cleared. Invokes NotifyAndDeleteIfDone.
   virtual void OnWaitableEventSignaled(
       base::WaitableEvent* waitable_event) OVERRIDE;
 
   // Removes the specified items related to browsing for a specific host. If the
-  // provided |origin| is empty, data is removed for all origins. If
-  // |remove_protected_origins| is true, then data is removed even if the origin
-  // is otherwise protected (e.g. as an installed application).
+  // provided |origin| is empty, data is removed for all origins. The
+  // |origin_set_mask| parameter defines the set of origins from which data
+  // should be removed (protected, unprotected, or both).
   void RemoveImpl(int remove_mask,
                   const GURL& origin,
-                  bool remove_protected_origins);
+                  int origin_set_mask);
 
   // If we're not waiting on anything, notifies observers and deletes this
   // object.
   void NotifyAndDeleteIfDone();
 
   // Callback when the network history has been deleted. Invokes
   // NotifyAndDeleteIfDone.
   void ClearedNetworkHistory();
 
   // Invoked on the IO thread to clear the HostCache, speculative data about
@@ skipping 110 matching lines @@
   // gathering origins.
   int quota_managed_origins_to_delete_count_;
   int quota_managed_storage_types_to_delete_count_;
 
   // The removal mask for the current removal operation.
   int remove_mask_;
 
   // The origin for the current removal operation.
   GURL remove_origin_;
 
-  // Should data for protected origins be removed?
-  bool remove_protected_;
+  // From which types of origins should we remove data?
+  int origin_set_mask_;
 
   ObserverList<Observer> observer_list_;
 
   // Used if we need to clear history.
   CancelableRequestConsumer request_consumer_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowsingDataRemover);
 };
 
 #endif  // CHROME_BROWSER_BROWSING_DATA_REMOVER_H_