Fix the multi-threaded access to WeakPtr<BrowsingDataRemoverImpl>

chrome/browser/browsing_data/browsing_data_remover_delegate.h

Index: chrome/browser/browsing_data/browsing_data_remover_delegate.h
diff --git a/chrome/browser/browsing_data/browsing_data_remover_delegate.h b/chrome/browser/browsing_data/browsing_data_remover_delegate.h
index 69600a88d4e9f8059ee358c585ce443790a456cb..4483fd79f7b2e2e63afeb3292b0aaf2f511e4189 100644
--- a/chrome/browser/browsing_data/browsing_data_remover_delegate.h
+++ b/chrome/browser/browsing_data/browsing_data_remover_delegate.h
@@ -23,15 +23,21 @@ class SpecialStoragePolicy;
 
 class BrowsingDataRemoverDelegate {
  public:
+  // Determines whether |origin| matches |origin_type_mask| given
+  // the |special_storage_policy|.
+  typedef base::Callback<bool(int origin_type_mask,
+                              const GURL& origin,
+                              storage::SpecialStoragePolicy* policy)>
+      EmbedderOriginTypeMatcher;
+
   virtual ~BrowsingDataRemoverDelegate() {}
 
-  // Determines whether |origin| matches |origin_type_mask|
-  // given the |special_storage_policy|. |origin_type_mask| should only contain
-  // embedder-specific datatypes.
-  virtual bool DoesOriginMatchEmbedderMask(
-      int origin_type_mask,
-      const GURL& origin,
-      storage::SpecialStoragePolicy* special_storage_policy) const = 0;
+  // Returns a MaskMatcherFunction to match embedder's origin types.
+  // This MaskMatcherFunction will be called with an |origin_type_mask|
+  // parameter containing ONLY embedder-defined origin types, and must be able
+  // to handle ALL embedder-defined typed. It must be static and support
+  // being called on the UI and IO thread.
+  virtual EmbedderOriginTypeMatcher GetOriginTypeMatcher() const = 0;
 
   // Removes embedder-specific data.
   virtual void RemoveEmbedderData(