Add removal filter support for Cookies, Storage, and Content Settings.

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 <stdint.h>
 
 #include <set>
 
+#include "base/callback_forward.h"
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "base/sequenced_task_runner_helpers.h"
 #include "base/synchronization/waitable_event_watcher.h"
 #include "base/task/cancelable_task_tracker.h"
 #include "base/time/time.h"
 #include "build/build_config.h"
 #include "chrome/common/features.h"
+#include "components/content_settings/core/common/content_settings_pattern.h"
+#include "components/content_settings/core/common/content_settings_types.h"
 #include "components/keyed_service/core/keyed_service.h"
 #include "components/prefs/pref_member.h"
 #include "components/search_engines/template_url_service.h"
 #include "storage/common/quota/quota_types.h"
 #include "url/gurl.h"
 
 #if defined(ENABLE_PLUGINS)
 #include "chrome/browser/pepper_flash_settings_manager.h"
 #endif
 
 #if defined(OS_CHROMEOS)
 #include "chromeos/dbus/dbus_method_call_status.h"
 #endif
 
 class BrowsingDataRemoverFactory;
+class HostContentSettingsMap;
 class IOThread;
+class BrowsingDataRemoverFilter;
 class Profile;
 
 namespace chrome_browser_net {
 class Predictor;
 }
 
 namespace content {
 class BrowserContext;
 class PluginDataRemover;
 class StoragePartition;
@@ skipping 194 matching lines @@
   // interface.
   static CallbackSubscription RegisterOnBrowsingDataRemovedCallback(
       const Callback& callback);
 
   // Removes the specified items related to browsing for all origins that match
   // the provided |origin_type_mask| (see BrowsingDataHelper::OriginTypeMask).
   void Remove(const TimeRange& time_range,
               int remove_mask,
               int origin_type_mask);
 
+  // Removes the specified items related to browsing for all origins that match
+  // the provided |origin_type_mask| (see BrowsingDataHelper::OriginTypeMask).
+  // The |origin_filter| is used as a final filter for clearing operations.
+  // TODO(dmurph): Support all backends with filter (crbug.com/113621).
+  // DO NOT USE THIS METHOD UNLESS CALLER KNOWS WHAT THEY'RE DOING. NOT ALL
+  // BACKENDS ARE SUPPORTED YET, AND MORE DATA THAN EXPECTED COULD BE DELETED.

[kinuko, 2016/04/07 09:03:08]

Phew...

+  void RemoveWithFilter(const TimeRange& time_range,
+                        int remove_mask,
+                        int origin_type_mask,
+                        const BrowsingDataRemoverFilter& origin_filter);
+
   void AddObserver(Observer* observer);
   void RemoveObserver(Observer* observer);
 
   // Used for testing.
   void OverrideStoragePartitionForTesting(
       content::StoragePartition* storage_partition);
 
 #if BUILDFLAG(ANDROID_JAVA_UI)
   void OverrideWebappRegistryForTesting(
       scoped_ptr<WebappRegistry> webapp_registry);
 #endif
 
  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);
+  // Testing our static method, ClearSettingsForOneTypeWithPredicate.
+  FRIEND_TEST_ALL_PREFIXES(BrowsingDataRemoverTest, ClearWithPredicate);
 
   // 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;
 
   friend class BrowsingDataRemoverFactory;
 
+  // Clears all host-specific settings for one content type that satisfy the
+  // given predicate.
+  //
+  // This should only be called on the UI thread.
+  static void ClearSettingsForOneTypeWithPredicate(
+      HostContentSettingsMap* content_settings_map,
+      ContentSettingsType content_type,
+      const base::Callback<
+          bool(const ContentSettingsPattern& primary_pattern,
+               const ContentSettingsPattern& secondary_pattern)>& predicate);
+
   // Use BrowsingDataRemoverFactory::GetForBrowserContext to get an instance of
   // this class.
   BrowsingDataRemover(content::BrowserContext* browser_context);
   ~BrowsingDataRemover() override;
 
   void Shutdown() override;
 
   // Setter for |is_removing_|; DCHECKs that we can only start removing if we're
   // not already removing, and vice-versa.
   void SetRemoving(bool is_removing);
@@ skipping 11 matching lines @@
                                              bool success) override;
 #endif
 
 #if defined (OS_CHROMEOS)
   void OnClearPlatformKeys(chromeos::DBusMethodCallStatus call_status,
                            bool result);
 #endif
 
   // Removes the specified items related to browsing for a specific host. If the
   // provided |remove_url| is empty, data is removed for all origins; otherwise,
-  // it is restricted by origin (where implemented yet). The
+  // it is restricted by the origin filter origin (where implemented yet). The
   // |origin_type_mask| parameter defines the set of origins from which data
   // should be removed (protected, unprotected, or both).
   // TODO(ttr314): Remove "(where implemented yet)" constraint above once
   // crbug.com/113621 is done.
+  // TODO(crbug.com/589586): Support all backends w/ origin filter.
   void RemoveImpl(const TimeRange& time_range,
                   int remove_mask,
-                  const GURL& remove_url,
+                  const BrowsingDataRemoverFilter& origin_filter,
                   int origin_type_mask);
 
   // Notifies observers and transitions to the idle state.
   void Notify();
 
   // Checks if we are all done, and if so, calls Notify().
   void NotifyIfDone();
 
   // Called when history deletion is done.
   void OnHistoryDeletionDone();
@@ skipping 161 matching lines @@
   // not initialised, so the registry must be mocked out.
   scoped_ptr<WebappRegistry> webapp_registry_;
 #endif
 
   base::WeakPtrFactory<BrowsingDataRemover> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowsingDataRemover);
 };
 
 #endif  // CHROME_BROWSER_BROWSING_DATA_BROWSING_DATA_REMOVER_H_