Small: Start checking URLs using PVer4. Verdict not returned to client yet.

chrome/browser/loader/safe_browsing_resource_throttle.cc

Index: chrome/browser/loader/safe_browsing_resource_throttle.cc
diff --git a/chrome/browser/loader/safe_browsing_resource_throttle.cc b/chrome/browser/loader/safe_browsing_resource_throttle.cc
index b8a7c538393a10609b71cf8c9f1b59991f6de7f4..936fed6dd405e277abd495533ab7b4b4201d9bc2 100644
--- a/chrome/browser/loader/safe_browsing_resource_throttle.cc
+++ b/chrome/browser/loader/safe_browsing_resource_throttle.cc
@@ -15,6 +15,7 @@
 #include "chrome/browser/prerender/prerender_contents.h"
 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
 #include "components/safe_browsing_db/util.h"
+#include "components/safe_browsing_db/v4_local_database_manager.h"
 #include "components/subresource_filter/content/browser/content_subresource_filter_driver_factory.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_frame_host.h"
@@ -96,7 +97,8 @@ SafeBrowsingResourceThrottle::SafeBrowsingResourceThrottle(
       resource_type_(resource_type),
       net_log_with_source_(
           net::NetLogWithSource::Make(request->net_log().net_log(),
-                                      NetLogSourceType::SAFE_BROWSING)) {}
+                                      NetLogSourceType::SAFE_BROWSING)),
+      v4_local_database_manager_(sb_service->v4_local_database_manager()) {}
 
 SafeBrowsingResourceThrottle::~SafeBrowsingResourceThrottle() {
   if (defer_state_ != DEFERRED_NONE) {
@@ -107,6 +109,10 @@ SafeBrowsingResourceThrottle::~SafeBrowsingResourceThrottle() {
     database_manager_->CancelCheck(this);
     EndNetLogEvent(NetLogEventType::SAFE_BROWSING_CHECKING_URL, "result",
                    "request_canceled");
+
+    if (v4_local_database_manager_) {
+      v4_local_database_manager_->CancelCheck(this);
+    }

[Scott Hess - ex-Googler, 2016/09/27 22:24:53]

Move this above the log event.

[vakh (use Gerrit instead), 2016/09/28 01:24:33]

Done.

   }
 }
 
@@ -373,6 +379,11 @@ bool SafeBrowsingResourceThrottle::CheckUrl(const GURL& url) {
   UMA_HISTOGRAM_ENUMERATION("SB2.ResourceTypes2.Checked", resource_type_,
                             content::RESOURCE_TYPE_LAST_TYPE);
 
+  if (v4_local_database_manager_ &&
+      v4_local_database_manager_->CanCheckResourceType(resource_type_)) {
+    v4_local_database_manager_->CheckBrowseUrl(url, this);
+  }
+
   if (succeeded_synchronously) {
     threat_type_ = safe_browsing::SB_THREAT_TYPE_SAFE;
     ui_manager_->LogPauseDelay(base::TimeDelta());  // No delay.
@@ -400,6 +411,9 @@ void SafeBrowsingResourceThrottle::OnCheckUrlTimeout() {
   database_manager_->CancelCheck(this);
   OnCheckBrowseUrlResult(url_being_checked_, safe_browsing::SB_THREAT_TYPE_SAFE,
                          safe_browsing::ThreatMetadata());
+  if (v4_local_database_manager_) {
+    v4_local_database_manager_->CancelCheck(this);
+  }

[Scott Hess - ex-Googler, 2016/09/27 22:24:53]

Probably move this above the response, so that both sub-systems cancel before
the callback.

[vakh (use Gerrit instead), 2016/09/28 01:24:33]

Done.

 }
 
 void SafeBrowsingResourceThrottle::ResumeRequest() {