[WebView] initial webview-side implementation of safebrowsing

android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.cc

Index: android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.cc
diff --git a/android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.cc b/android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.cc
index 6f63c9df9a9d520d1e2fb826f6b8b2ecb065c719..c14a0b3e0fe04cc16d844fe30a1ba359df198177 100644
--- a/android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.cc
+++ b/android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.cc
@@ -14,9 +14,12 @@
 #include "android_webview/browser/aw_resource_context.h"
 #include "android_webview/browser/net/aw_web_resource_request.h"
 #include "android_webview/browser/renderer_host/auto_login_parser.h"
+#include "android_webview/common/aw_switches.h"
 #include "android_webview/common/url_constants.h"
+#include "base/command_line.h"

[sgurun-gerrit only, 2017/01/16 15:11:19]

see the note below, remove.

 #include "base/memory/scoped_vector.h"
 #include "components/navigation_interception/intercept_navigation_delegate.h"
+#include "components/safe_browsing/base_resource_throttle.h"
 #include "components/web_restrictions/browser/web_restrictions_resource_throttle.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/resource_dispatcher_host.h"
@@ -254,8 +257,10 @@ void AwResourceDispatcherHostDelegate::ResourceDispatcherHostCreated() {
 }
 
 AwResourceDispatcherHostDelegate::AwResourceDispatcherHostDelegate()
-    : content::ResourceDispatcherHostDelegate() {
-}
+    : content::ResourceDispatcherHostDelegate(),
+      safebrowsing_support_enabled(

[sgurun-gerrit only, 2017/01/16 15:11:19]

see the note below, remove.

+          base::CommandLine::ForCurrentProcess()->HasSwitch(
+              ::switches::kWebViewEnableSafeBrowsingSupport)) {}
 
 AwResourceDispatcherHostDelegate::~AwResourceDispatcherHostDelegate() {
 }
@@ -271,6 +276,20 @@ void AwResourceDispatcherHostDelegate::RequestBeginning(
   const content::ResourceRequestInfo* request_info =
       content::ResourceRequestInfo::ForRequest(request);
 
+  if (safebrowsing_support_enabled) {

[sgurun-gerrit only, 2017/01/16 15:11:19]

you are already checking for this in AwBrowserContext. no need to repeat.
remove.

[timvolodine, 2017/01/16 18:58:57]

Without this guard we'll add a safebrowsing throttle (with all the related
classes) everytime even if the functionality is completely disabled. This would
lead to unnecessary overhead for each loaded resource on all devices where it is
not enabled. Also some unnecessary UMA logging which in addition would be skewed
by this (e.g. UMA_STATUS_UNSUPPORTED, some SB2.RemoteCall.*, ...)

[timvolodine, 2017/01/16 19:01:56]

Oh hold on, you probably meant throttle should be null in that case because of
DatabaseManager::IsSupported should be false when safebrowsing is disabled.. hmm
will rework the code a bit for that to work ;)

+    content::ResourceThrottle* throttle =
+        safe_browsing::BaseResourceThrottle::MaybeCreate(
+            request, resource_type,
+            AwBrowserContext::GetDefault()->GetSafeBrowsingDBManager(),
+            AwBrowserContext::GetDefault()->GetSafeBrowsingUIManager());
+    if (throttle == nullptr) {
+      // TODO(timvolodine) perhaps just DLOG
+      LOG(WARNING) << "Failed creating safebrowsing throttle";

[sgurun-gerrit only, 2017/01/16 15:11:19]

do a DLOG as this is expected  fail mode for AOSP devices.

[timvolodine, 2017/01/16 18:58:57]

Done.

[timvolodine, 2017/01/16 22:42:00]

Actually don't think this will be the fail mode on AOSP, because the internal
handler construction is on demand. Might be possible to remove the logging
completely here.

+    } else {
+      throttles->push_back(base::WrapUnique(throttle));
+    }
+  }
+
   // We always push the throttles here. Checking the existence of io_client
   // is racy when a popup window is created. That is because RequestBeginning
   // is called whether or not requests are blocked via BlockRequestForRoute()