Support desktop safebrowsing on Android behind compile flag.
This changes a bunch of code previously gated on using the local DB to
instead be gated on the FULL_SAFE_BROWSING flag as some features aren't
supported on Android regardless of localness of the database.
This CL also caps the database entry counts to the same (or larger)
values than those used by GMS safe browsing by default. This currently
results in a DB size of approximately 203KB.
Tested locally on a device without GMS, and safe browsing appears
to work correctly.
Bug: 928236
Change-Id: Ic855c775fb5dcdf8f3ea8e37056cfe0f3d583dd5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1452062
Reviewed-by: Varun Khaneja <[email protected]>
Reviewed-by: John Abd-El-Malek <[email protected]>
Commit-Queue: Michael Thiessen <[email protected]>
Cr-Commit-Position: refs/heads/master@{#638912}diff --git a/chrome/browser/ui/page_info/page_info.cc b/chrome/browser/ui/page_info/page_info.cc
index 44cb3ac..f9af799 100644
--- a/chrome/browser/ui/page_info/page_info.cc
+++ b/chrome/browser/ui/page_info/page_info.cc
@@ -89,7 +89,7 @@
#include "chrome/browser/ui/page_info/page_info_infobar_delegate.h"
#endif
-#if defined(SAFE_BROWSING_DB_LOCAL)
+#if defined(FULL_SAFE_BROWSING)
#include "chrome/browser/safe_browsing/chrome_password_protection_service.h"
#endif
@@ -97,10 +97,10 @@
using base::UTF8ToUTF16;
using base::UTF16ToUTF8;
using content::BrowserThread;
-#if defined(SAFE_BROWSING_DB_LOCAL)
+#if defined(FULL_SAFE_BROWSING)
using PasswordReuseEvent =
safe_browsing::LoginReputationClientRequest::PasswordReuseEvent;
-#endif // SAFE_BROWSING_DB_LOCAL
+#endif // FULL_SAFE_BROWSING
namespace {
@@ -345,7 +345,7 @@
did_revoke_user_ssl_decisions_(false),
profile_(profile),
security_level_(security_state::NONE),
-#if defined(SAFE_BROWSING_DB_LOCAL)
+#if defined(FULL_SAFE_BROWSING)
password_protection_service_(
safe_browsing::ChromePasswordProtectionService::
GetPasswordProtectionService(profile_)),
@@ -555,7 +555,7 @@
void PageInfo::OnChangePasswordButtonPressed(
content::WebContents* web_contents) {
-#if defined(SAFE_BROWSING_DB_LOCAL)
+#if defined(FULL_SAFE_BROWSING)
DCHECK(password_protection_service_);
DCHECK(site_identity_status_ == SITE_IDENTITY_STATUS_SIGN_IN_PASSWORD_REUSE ||
site_identity_status_ ==
@@ -572,7 +572,7 @@
void PageInfo::OnWhitelistPasswordReuseButtonPressed(
content::WebContents* web_contents) {
-#if defined(SAFE_BROWSING_DB_LOCAL)
+#if defined(FULL_SAFE_BROWSING)
DCHECK(password_protection_service_);
DCHECK(site_identity_status_ == SITE_IDENTITY_STATUS_SIGN_IN_PASSWORD_REUSE ||
site_identity_status_ ==
@@ -963,7 +963,7 @@
info.show_ssl_decision_revoke_button = show_ssl_decision_revoke_button_;
info.show_change_password_buttons = show_change_password_buttons_;
ui_->SetIdentityInfo(info);
-#if defined(SAFE_BROWSING_DB_LOCAL)
+#if defined(FULL_SAFE_BROWSING)
if (password_protection_service_ && show_change_password_buttons_) {
if (site_identity_status_ == SITE_IDENTITY_STATUS_SIGN_IN_PASSWORD_REUSE) {
safe_browsing::LogWarningAction(
@@ -1027,7 +1027,7 @@
l10n_util::GetStringUTF16(IDS_PAGE_INFO_UNWANTED_SOFTWARE_DETAILS);
break;
case security_state::MALICIOUS_CONTENT_STATUS_SIGN_IN_PASSWORD_REUSE:
-#if defined(SAFE_BROWSING_DB_LOCAL)
+#if defined(FULL_SAFE_BROWSING)
*status = PageInfo::SITE_IDENTITY_STATUS_SIGN_IN_PASSWORD_REUSE;
// |password_protection_service_| may be null in test.
*details = password_protection_service_
@@ -1037,7 +1037,7 @@
#endif
break;
case security_state::MALICIOUS_CONTENT_STATUS_ENTERPRISE_PASSWORD_REUSE:
-#if defined(SAFE_BROWSING_DB_LOCAL)
+#if defined(FULL_SAFE_BROWSING)
*status = PageInfo::SITE_IDENTITY_STATUS_ENTERPRISE_PASSWORD_REUSE;
// |password_protection_service_| maybe null in test.
*details = password_protection_service_
