summaryrefslogtreecommitdiffstats
path: root/chromium/chrome/browser/safe_browsing
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2019-08-30 10:22:43 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2019-08-30 12:36:28 +0000
commit271a6c3487a14599023a9106329505597638d793 (patch)
treee040d58ffc86c1480b79ca8528020ca9ec919bf8 /chromium/chrome/browser/safe_browsing
parent7b2ffa587235a47d4094787d72f38102089f402a (diff)
BASELINE: Update Chromium to 77.0.3865.59
Change-Id: I1e89a5f3b009a9519a6705102ad65c92fe736f21 Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/chrome/browser/safe_browsing')
-rw-r--r--chromium/chrome/browser/safe_browsing/BUILD.gn21
-rw-r--r--chromium/chrome/browser/safe_browsing/chrome_cleaner/BUILD.gn9
2 files changed, 17 insertions, 13 deletions
diff --git a/chromium/chrome/browser/safe_browsing/BUILD.gn b/chromium/chrome/browser/safe_browsing/BUILD.gn
index cc98a0bf4f1..2be129ce18a 100644
--- a/chromium/chrome/browser/safe_browsing/BUILD.gn
+++ b/chromium/chrome/browser/safe_browsing/BUILD.gn
@@ -36,10 +36,10 @@ jumbo_static_library("safe_browsing") {
"//components/safe_browsing/web_ui",
"//components/search_engines",
"//components/sessions",
+ "//components/signin/public/identity_manager",
"//components/url_formatter",
"//mojo/public/cpp/platform",
"//mojo/public/cpp/system",
- "//services/identity/public/cpp",
"//services/preferences/public/cpp",
]
@@ -98,10 +98,12 @@ jumbo_static_library("safe_browsing") {
"//components/safe_browsing/browser",
"//components/safe_browsing/common",
"//components/safe_browsing/common:safe_browsing_prefs",
+ "//components/safe_browsing/db:allowlist_checker_client",
"//components/safe_browsing/db:metadata_proto",
- "//components/safe_browsing/db:whitelist_checker_client",
"//components/safe_browsing/password_protection",
"//components/safe_browsing/triggers",
+ "//components/safe_browsing/triggers:ad_popup_trigger",
+ "//components/safe_browsing/triggers:ad_redirect_trigger",
"//components/safe_browsing/triggers:ad_sampler_trigger",
"//components/safe_browsing/triggers:suspicious_site_trigger",
"//components/safe_browsing/triggers:trigger_throttler",
@@ -112,8 +114,6 @@ jumbo_static_library("safe_browsing") {
sources += [
"../download/download_completion_blocker.cc",
"../download/download_completion_blocker.h",
- "../loader/safe_browsing_resource_throttle.cc",
- "../loader/safe_browsing_resource_throttle.h",
"browser_feature_extractor.cc",
"browser_feature_extractor.h",
"browser_features.cc",
@@ -126,6 +126,8 @@ jumbo_static_library("safe_browsing") {
"client_side_detection_service.h",
"client_side_model_loader.cc",
"client_side_model_loader.h",
+ "download_protection/binary_upload_service.cc",
+ "download_protection/binary_upload_service.h",
"download_protection/check_client_download_request.cc",
"download_protection/check_client_download_request.h",
"download_protection/download_feedback.cc",
@@ -140,6 +142,8 @@ jumbo_static_library("safe_browsing") {
"download_protection/download_url_sb_client.h",
"download_protection/file_analyzer.cc",
"download_protection/file_analyzer.h",
+ "download_protection/multipart_uploader.cc",
+ "download_protection/multipart_uploader.h",
"download_protection/path_sanitizer.cc",
"download_protection/path_sanitizer.h",
"download_protection/ppapi_download_request.cc",
@@ -208,9 +212,9 @@ jumbo_static_library("safe_browsing") {
"//components/content_settings/core/browser",
"//components/language/core/common",
"//components/prefs",
+ "//components/safe_browsing:webprotect_proto",
"//components/safe_browsing/db",
"//components/security_interstitials/content:security_interstitial_page",
- "//components/signin/core/browser",
"//content/public/browser",
"//net",
]
@@ -219,8 +223,6 @@ jumbo_static_library("safe_browsing") {
}
} else if (safe_browsing_mode == 2) {
sources += [
- "../loader/safe_browsing_resource_throttle.cc",
- "../loader/safe_browsing_resource_throttle.h",
"android/file_type_policies.cc",
"android/services_delegate_android.cc",
"android/services_delegate_android.h",
@@ -233,8 +235,6 @@ jumbo_static_library("safe_browsing") {
]
} else if (safe_browsing_mode == 3) {
sources += [
- "../loader/safe_browsing_resource_throttle.cc",
- "../loader/safe_browsing_resource_throttle.h",
"android/file_type_policies.cc",
"android/services_delegate_android.cc",
"android/services_delegate_android.h",
@@ -262,9 +262,8 @@ static_library("advanced_protection") {
"//components/prefs",
"//components/safe_browsing/common",
"//components/safe_browsing/common:safe_browsing_prefs",
- "//components/signin/core/browser",
+ "//components/signin/public/identity_manager",
"//content/public/browser",
- "//services/identity/public/cpp",
]
}
diff --git a/chromium/chrome/browser/safe_browsing/chrome_cleaner/BUILD.gn b/chromium/chrome/browser/safe_browsing/chrome_cleaner/BUILD.gn
index 7b7d767ce54..630f878f95c 100644
--- a/chromium/chrome/browser/safe_browsing/chrome_cleaner/BUILD.gn
+++ b/chromium/chrome/browser/safe_browsing/chrome_cleaner/BUILD.gn
@@ -3,6 +3,7 @@
# found in the LICENSE file.
import("//build/config/jumbo.gni")
+import("//third_party/protobuf/proto_library.gni")
source_set("public") {
sources = [
@@ -41,12 +42,14 @@ jumbo_static_library("chrome_cleaner") {
"chrome_cleaner_reboot_dialog_controller_impl_win.h",
"chrome_cleaner_runner_win.cc",
"chrome_cleaner_runner_win.h",
+ "chrome_prompt_actions_win.cc",
+ "chrome_prompt_actions_win.h",
+ "chrome_prompt_channel_win.cc",
+ "chrome_prompt_channel_win.h",
"reporter_runner_win.cc",
"reporter_runner_win.h",
"settings_resetter_win.cc",
"settings_resetter_win.h",
- "srt_chrome_prompt_impl_win.cc",
- "srt_chrome_prompt_impl_win.h",
"srt_client_info_win.cc",
"srt_client_info_win.h",
]
@@ -61,6 +64,7 @@ jumbo_static_library("chrome_cleaner") {
"//chrome/installer/util:with_no_strings",
"//components/chrome_cleaner/public/constants",
"//components/chrome_cleaner/public/interfaces",
+ "//components/chrome_cleaner/public/proto",
"//components/component_updater",
"//components/crx_file",
"//components/pref_registry",
@@ -68,5 +72,6 @@ jumbo_static_library("chrome_cleaner") {
"//components/safe_browsing/common:safe_browsing_prefs",
"//content/public/browser",
"//extensions/browser",
+ "//third_party/protobuf:protobuf_lite",
]
}