Fix the multi-threaded access to WeakPtr<BrowsingDataRemoverImpl>

chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.h

Index: chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.h
diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.h b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.h
index 17a19c465799981e4dd43f67f2c46b892f12a784..e725c69ee113b8d60474e6551333657dc17db0fc 100644
--- a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.h
+++ b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.h
@@ -173,10 +173,8 @@ class ChromeBrowsingDataRemoverDelegate : public BrowsingDataRemoverDelegate
   ~ChromeBrowsingDataRemoverDelegate() override;
 
   // BrowsingDataRemoverDelegate:
-  bool DoesOriginMatchEmbedderMask(
-      int origin_type_mask,
-      const GURL& origin,
-      storage::SpecialStoragePolicy* special_storage_policy) const override;
+  BrowsingDataRemoverDelegate::EmbedderOriginTypeMatcher GetOriginTypeMatcher()
+      const override;
   void RemoveEmbedderData(
       const base::Time& delete_begin,
       const base::Time& delete_end,
@@ -197,6 +195,12 @@ class ChromeBrowsingDataRemoverDelegate : public BrowsingDataRemoverDelegate
 #endif
 
  private:
+  // Returned by GetOriginTypeMatcher().
+  static bool DoesOriginMatchEmbedderMask(

[Bernhard Bauer, 2017/04/06 15:02:12]

Does this need to be part of the class, or could it live in an anonymous
namespace in the .cc file? I don't see anything in there that requires private
access to class members. (If there is something, please add a comment here :) )

[msramek, 2017/04/06 16:27:30]

Done. No, it doesn't.

+      int origin_type_mask,
+      const GURL& origin,
+      storage::SpecialStoragePolicy* special_storage_policy);
+
   // If AllDone(), calls the callback provided in RemoveEmbedderData().
   void NotifyIfDone();