[subresource_filter] SB throttle can send multiple speculative requests.

components/subresource_filter/content/browser/fake_safe_browsing_database_manager.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 "components/subresource_filter/content/browser/fake_safe_browsing_database_manager.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "content/public/browser/browser_thread.h"
 #include "url/gurl.h"
@@ skipping 14 matching lines @@
 FakeSafeBrowsingDatabaseManager::~FakeSafeBrowsingDatabaseManager() {}
 
 bool FakeSafeBrowsingDatabaseManager::CheckUrlForSubresourceFilter(
     const GURL& url,
     Client* client) {
   if (simulate_timeout_)
     return false;
   if (!url_to_threat_type_.count(url))
     return true;
 
+  // Enforce the invariant that a client will not send multiple requests, with
+  // the subresource filter client implementation.
+  DCHECK(checks_.find(client) == checks_.end());

[engedy, 2017/04/25 22:03:53]

#include "base/logging.h"

[Charlie Harrison, 2017/04/26 14:30:25]

Done.

+  checks_.insert(client);
   content::BrowserThread::PostTask(
       content::BrowserThread::IO, FROM_HERE,
-      base::Bind(&Client::OnCheckBrowseUrlResult, base::Unretained(client), url,
-                 url_to_threat_type_[url], safe_browsing::ThreatMetadata()));
+      base::Bind(&FakeSafeBrowsingDatabaseManager::
+                     OnCheckUrlForSubresourceFilterComplete,
+                 base::Unretained(this), base::Unretained(client), url));
   return false;
 }
 
+void FakeSafeBrowsingDatabaseManager::OnCheckUrlForSubresourceFilterComplete(
+    Client* client,
+    const GURL& url) {
+  // Check to see if the request was cancelled to avoid use-after-free.
+  if (checks_.find(client) == checks_.end())
+    return;
+  client->OnCheckBrowseUrlResult(url, url_to_threat_type_[url],
+                                 safe_browsing::ThreatMetadata());
+}
+
 bool FakeSafeBrowsingDatabaseManager::CheckResourceUrl(const GURL& url,
                                                        Client* client) {
   return true;
 }
 
 bool FakeSafeBrowsingDatabaseManager::IsSupported() const {
   return true;
 }
 bool FakeSafeBrowsingDatabaseManager::ChecksAreAlwaysAsync() const {
   return false;
 }
-void FakeSafeBrowsingDatabaseManager::CancelCheck(Client* client) {}
+void FakeSafeBrowsingDatabaseManager::CancelCheck(Client* client) {
+  checks_.erase(client);
+}
 bool FakeSafeBrowsingDatabaseManager::CanCheckResourceType(
     content::ResourceType /* resource_type */) const {
   return true;
 }
 
 safe_browsing::ThreatSource FakeSafeBrowsingDatabaseManager::GetThreatSource()
     const {
   return safe_browsing::ThreatSource::LOCAL_PVER4;
 }
 
 bool FakeSafeBrowsingDatabaseManager::CheckExtensionIDs(
     const std::set<std::string>& extension_ids,
     Client* client) {
   return true;
 }