Add origin-based deletion to BrowsingDataRemover

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 99 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.
+  // Removes the specified items related to browsing for all origins.
   void Remove(int remove_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);
 
   static bool is_removing() { return removing_; }
 
  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.
+  //
+  // TODO(mkwst): See http://crbug.com/113621
+  friend class BrowsingDataRemoverTest;
+
   enum CacheState {
     STATE_NONE,
     STATE_CREATE_MAIN,
     STATE_CREATE_MEDIA,
     STATE_DELETE_MAIN,
     STATE_DELETE_MEDIA,
     STATE_DONE
   };
 
   // BrowsingDataRemover deletes itself (using DeleteTask) and is not supposed
   // to be deleted by other objects so make destructor private and DeleteTask
   // a friend.
   friend class base::DeleteHelper<BrowsingDataRemover>;
   virtual ~BrowsingDataRemover();
 
   // content::NotificationObserver method. Callback when TemplateURLService has
   // finished loading. Deletes the entries from the model, and if we're not
   // waiting on anything else notifies observers and deletes this
   // BrowsingDataRemover.
   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).
+  void RemoveImpl(int remove_mask,
+                  const GURL& origin,
+                  bool remove_protected_origins);
+
   // 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
   // subresources on visited sites, and initial navigation history.
@@ skipping 105 matching lines @@
   bool waiting_for_clear_quota_managed_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_;
 
   // 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_;
+
   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_