Fix the multi-threaded access to WeakPtr<BrowsingDataRemoverImpl>

chrome/browser/browsing_data/mock_browsing_data_remover_delegate.h

 // 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.
 
 #ifndef CHROME_BROWSER_BROWSING_DATA_MOCK_BROWSING_DATA_REMOVER_DELEGATE_H_
 #define CHROME_BROWSER_BROWSING_DATA_MOCK_BROWSING_DATA_REMOVER_DELEGATE_H_
 
 #include <list>
 #include <memory>
 
 #include "base/time/time.h"
 #include "chrome/browser/browsing_data/browsing_data_remover_delegate.h"
 #include "content/public/browser/browsing_data_filter_builder.h"
 
 // A BrowsingDataRemoverDelegate that only records RemoveEmbedderData() calls.
 class MockBrowsingDataRemoverDelegate : public BrowsingDataRemoverDelegate {
  public:
   MockBrowsingDataRemoverDelegate();
   ~MockBrowsingDataRemoverDelegate() 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;
 
   // Add an expected call for testing.
   void ExpectCall(const base::Time& delete_begin,
@@ skipping 32 matching lines @@
     int origin_type_mask_;
     std::unique_ptr<content::BrowsingDataFilterBuilder> filter_builder_;
     bool should_compare_filter_;
   };
 
   std::list<CallParameters> actual_calls_;
   std::list<CallParameters> expected_calls_;
 };
 
 #endif  // CHROME_BROWSER_BROWSING_DATA_MOCK_BROWSING_DATA_REMOVER_DELEGATE_H_