Fix the multi-threaded access to WeakPtr<BrowsingDataRemoverImpl>

chrome/browser/browsing_data/mock_browsing_data_remover_delegate.cc

 // Copyright 2017 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.
 
 #include "chrome/browser/browsing_data/mock_browsing_data_remover_delegate.h"
 
 #include "base/callback.h"
 #include "content/public/browser/browsing_data_filter_builder.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 MockBrowsingDataRemoverDelegate::MockBrowsingDataRemoverDelegate() {}
 
 MockBrowsingDataRemoverDelegate::~MockBrowsingDataRemoverDelegate() {
   DCHECK(!expected_calls_.size()) << "Expectations were set but not verified.";
 }
 
-bool MockBrowsingDataRemoverDelegate::DoesOriginMatchEmbedderMask(
-    int origin_type_mask,
-    const GURL& origin,
-    storage::SpecialStoragePolicy* special_storage_policy) const {
-  return false;
+BrowsingDataRemoverDelegate::EmbedderOriginTypeMatcher
+MockBrowsingDataRemoverDelegate::GetOriginTypeMatcher() const {
+  return BrowsingDataRemoverDelegate::EmbedderOriginTypeMatcher();
 }
 
 void MockBrowsingDataRemoverDelegate::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) {
   actual_calls_.emplace_back(delete_begin, delete_end, remove_mask,
@@ skipping 55 matching lines @@
   if (a.delete_begin_ != b.delete_begin_ || a.delete_end_ != b.delete_end_ ||
       a.remove_mask_ != b.remove_mask_ ||
       a.origin_type_mask_ != b.origin_type_mask_) {
     return false;
   }
 
   if (!a.should_compare_filter_ || !b.should_compare_filter_)
     return true;
   return *a.filter_builder_ == *b.filter_builder_;
 }