Fix the multi-threaded access to WeakPtr<BrowsingDataRemoverImpl>

chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.h

 // Copyright 2016 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_CHROME_BROWSING_DATA_REMOVER_DELEGATE_H_
 #define CHROME_BROWSER_BROWSING_DATA_CHROME_BROWSING_DATA_REMOVER_DELEGATE_H_
 
 #include <memory>
 
 #include "base/callback_forward.h"
@@ skipping 155 matching lines @@
 
     bool is_pending_;
     const base::Closure& forward_callback_;
     base::WeakPtrFactory<SubTask> weak_ptr_factory_;
   };
 
   ChromeBrowsingDataRemoverDelegate(content::BrowserContext* browser_context);
   ~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,
       int remove_mask,
       const content::BrowsingDataFilterBuilder& filter_builder,
       int origin_type_mask,
       const base::Closure& callback) override;
 
 #if defined(OS_ANDROID)
   void OverrideWebappRegistryForTesting(
       std::unique_ptr<WebappRegistry> webapp_registry);
 #endif
 
 #if BUILDFLAG(ENABLE_PLUGINS)
   // Used for testing.
   void OverrideFlashLSOHelperForTesting(
       scoped_refptr<BrowsingDataFlashLSOHelper> flash_lso_helper);
 #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();
 
   // Whether there are no running deletion tasks.
   bool AllDone();
 
   // Callback for when TemplateURLService has finished loading. Clears the data,
   // clears the respective waiting flag, and invokes NotifyIfDone.
   void OnKeywordsLoaded(base::Callback<bool(const GURL&)> url_filter);
 
@@ skipping 94 matching lines @@
   // not initialised, so the registry must be mocked out.
   std::unique_ptr<WebappRegistry> webapp_registry_;
 #endif
 
   base::WeakPtrFactory<ChromeBrowsingDataRemoverDelegate> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeBrowsingDataRemoverDelegate);
 };
 
 #endif  // CHROME_BROWSER_BROWSING_DATA_CHROME_BROWSING_DATA_REMOVER_DELEGATE_H_