Fix the multi-threaded access to WeakPtr<BrowsingDataRemoverImpl>

chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc

 // 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.
 
 #include "chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.h"
 
 #include <set>
 #include <string>
 #include <utility>
 
@@ skipping 217 matching lines @@
 
   net::HttpNetworkSession* http_session = context_getter->GetURLRequestContext()
                                               ->http_transaction_factory()
                                               ->GetSession();
   DCHECK(http_session);
   http_session->http_auth_cache()->ClearEntriesAddedWithin(base::Time::Now() -
                                                            delete_begin);
   http_session->CloseAllConnections();
 }
 
+// Returned by ChromeBrowsingDataRemoverDelegate::GetOriginTypeMatcher().
+bool DoesOriginMatchEmbedderMask(int origin_type_mask,
+                                 const GURL& origin,
+                                 storage::SpecialStoragePolicy* policy) {
+  DCHECK_EQ(
+      0,
+      origin_type_mask &
+          (ChromeBrowsingDataRemoverDelegate::ORIGIN_TYPE_EMBEDDER_BEGIN - 1))
+      << "|origin_type_mask| can only contain origin types defined in "
+      << "the embedder.";
+
+#if BUILDFLAG(ENABLE_EXTENSIONS)
+  // Packaged apps and extensions match iff EXTENSION.
+  if ((origin.GetOrigin().scheme() == extensions::kExtensionScheme) &&
+      (origin_type_mask &
+       ChromeBrowsingDataRemoverDelegate::ORIGIN_TYPE_EXTENSION)) {
+    return true;
+  }
+  origin_type_mask &= ~ChromeBrowsingDataRemoverDelegate::ORIGIN_TYPE_EXTENSION;
+#endif
+
+  DCHECK(!origin_type_mask)
+      << "DoesOriginMatchEmbedderMask must handle all origin types.";
+
+  return false;
+}
+
 }  // namespace
 
 ChromeBrowsingDataRemoverDelegate::SubTask::SubTask(
     const base::Closure& forward_callback)
     : is_pending_(false),
       forward_callback_(forward_callback),
       weak_ptr_factory_(this) {
   DCHECK(!forward_callback_.is_null());
 }
 
@@ skipping 56 matching lines @@
 #if defined(OS_ANDROID)
       webapp_registry_(new WebappRegistry()),
 #endif
       weak_ptr_factory_(this) {}
 
 ChromeBrowsingDataRemoverDelegate::~ChromeBrowsingDataRemoverDelegate() {
   history_task_tracker_.TryCancelAll();
   template_url_sub_.reset();
 }
 
-bool ChromeBrowsingDataRemoverDelegate::DoesOriginMatchEmbedderMask(
-    int origin_type_mask,
-    const GURL& origin,
-    storage::SpecialStoragePolicy* policy) const {
-  DCHECK_EQ(0, origin_type_mask & (ORIGIN_TYPE_EMBEDDER_BEGIN - 1))
-      << "|origin_type_mask| can only contain origin types defined in "
-      << "the embedder.";
-
-#if BUILDFLAG(ENABLE_EXTENSIONS)
-  // Packaged apps and extensions match iff EXTENSION.
-  if ((origin.GetOrigin().scheme() == extensions::kExtensionScheme) &&
-      (origin_type_mask & ORIGIN_TYPE_EXTENSION)) {
-    return true;
-  }
-  origin_type_mask &= ~ORIGIN_TYPE_EXTENSION;
-#endif
-
-  DCHECK(!origin_type_mask)
-      << "DoesOriginMatchEmbedderMask must handle all origin types.";
-
-  return false;
+BrowsingDataRemoverDelegate::EmbedderOriginTypeMatcher
+ChromeBrowsingDataRemoverDelegate::GetOriginTypeMatcher() const {
+  return base::Bind(DoesOriginMatchEmbedderMask);
 }
 
 void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
     const base::Time& delete_begin,
     const base::Time& delete_end,
     int remove_mask,
     const BrowsingDataFilterBuilder& filter_builder,
     int origin_type_mask,
     const base::Closure& callback) {
   DCHECK(((remove_mask & ~FILTERABLE_DATA_TYPES) == 0) ||
@@ skipping 777 matching lines @@
 }
 
 void ChromeBrowsingDataRemoverDelegate::
 OnDeauthorizeFlashContentLicensesCompleted(
     uint32_t request_id,
     bool /* success */) {
   DCHECK_EQ(request_id, deauthorize_flash_content_licenses_request_id_);
   clear_flash_content_licenses_.GetCompletionCallback().Run();
 }
 #endif