diff options
| author | nparker <nparker@chromium.org> | 2015-04-18 06:33:07 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-04-18 13:33:33 +0000 |
| commit | 333f169bf09e1c455ea821520010ec8cc9658990 (patch) | |
| tree | 5cf3ebec106a89440a0e2fd28d045b3064e410e1 /chrome/browser/browser_process_impl.cc | |
| parent | efeef838abec5ccef45e7c4af1f7f4cf986aa045 (diff) | |
| download | chromium_src-333f169bf09e1c455ea821520010ec8cc9658990.zip chromium_src-333f169bf09e1c455ea821520010ec8cc9658990.tar.gz chromium_src-333f169bf09e1c455ea821520010ec8cc9658990.tar.bz2 | |
Refactor safe-browsing build-config definitions.
Centralize the configuration and break things down into individual sub-systems to enable, rather than referring to feature bundles.
I will in a later CL add safe_browsing==3 for enabling XLB on Android, which will define SAFE_BROWSING_DB_REMOTE. When launched, this will replace mode 2.
SAFE_BROWSING_SERVICE - enable the browser to talk to the server.
SAFE_BROWSING_DB_LOCAL - maintain local database(s) synced from the server.
SAFE_BROWSING_DB_REMOTE - talk via API to an external DB (i.e. XLB).
SAFE_BROWSING_CSD - client-side phishing detection support.
This is nearly a copy of shess@'s 8-month-old
https://codereview.chromium.org/397853002/ which was LGTMed. Diffs: Mostly merge conflicts, a rename, and few files added
BUG=394379,474608
Review URL: https://codereview.chromium.org/1081403002
Cr-Commit-Position: refs/heads/master@{#325775}
Diffstat (limited to 'chrome/browser/browser_process_impl.cc')
| -rw-r--r-- | chrome/browser/browser_process_impl.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc index d463086..a5b6d0a 100644 --- a/chrome/browser/browser_process_impl.cc +++ b/chrome/browser/browser_process_impl.cc @@ -241,7 +241,7 @@ void BrowserProcessImpl::StartTearDown() { // URLFetcher operation before going away.) metrics_services_manager_.reset(); intranet_redirect_detector_.reset(); -#if defined(FULL_SAFE_BROWSING) || defined(MOBILE_SAFE_BROWSING) +#if defined(SAFE_BROWSING_SERVICE) if (safe_browsing_service_.get()) safe_browsing_service()->ShutDown(); #endif @@ -1123,7 +1123,7 @@ void BrowserProcessImpl::CreateSafeBrowsingService() { // Set this flag to true so that we don't retry indefinitely to // create the service class if there was an error. created_safe_browsing_service_ = true; -#if defined(FULL_SAFE_BROWSING) || defined(MOBILE_SAFE_BROWSING) +#if defined(SAFE_BROWSING_SERVICE) safe_browsing_service_ = SafeBrowsingService::CreateSafeBrowsingService(); safe_browsing_service_->Initialize(); #endif |