diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-12 14:27:29 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-13 09:35:20 +0000 |
| commit | c30a6232df03e1efbd9f3b226777b07e087a1122 (patch) | |
| tree | e992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/components/security_state/ios | |
| parent | 7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff) | |
| download | qtwebengine-chromium-85-based.tar.gz | |
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/components/security_state/ios')
4 files changed, 5 insertions, 6 deletions
diff --git a/chromium/components/security_state/ios/BUILD.gn b/chromium/components/security_state/ios/BUILD.gn index fae14dc9f8f..3243ff0aa75 100644 --- a/chromium/components/security_state/ios/BUILD.gn +++ b/chromium/components/security_state/ios/BUILD.gn @@ -15,8 +15,8 @@ component("ios") { deps = [ "//base", "//components/autofill/ios/form_util", + "//components/safe_browsing/ios/browser:allow_list", "//components/security_state/core", - "//ios/chrome/browser/safe_browsing:allow_list", "//ios/web/common", "//ios/web/public", "//ios/web/public/security", @@ -29,8 +29,8 @@ source_set("unit_tests") { sources = [ "security_state_utils_unittest.mm" ] deps = [ ":ios", + "//components/safe_browsing/ios/browser:allow_list", "//components/security_state/core", - "//ios/chrome/browser/safe_browsing:allow_list", "//ios/web/public/security", "//ios/web/public/test", ] diff --git a/chromium/components/security_state/ios/DEPS b/chromium/components/security_state/ios/DEPS index be3c0e5d193..b7afaad3911 100644 --- a/chromium/components/security_state/ios/DEPS +++ b/chromium/components/security_state/ios/DEPS @@ -1,8 +1,7 @@ include_rules = [ "+components/autofill/ios", "+components/security_state/core", - # TODO(crbug.com/1082521): Move safe browsing into iOS component code. - "+ios/chrome/browser/safe_browsing", + "+components/safe_browsing/ios", "+ios/web/common", "+ios/web/public", "+services/network/public/cpp", diff --git a/chromium/components/security_state/ios/security_state_utils.mm b/chromium/components/security_state/ios/security_state_utils.mm index 35fa426884f..6d3a43e7103 100644 --- a/chromium/components/security_state/ios/security_state_utils.mm +++ b/chromium/components/security_state/ios/security_state_utils.mm @@ -6,9 +6,9 @@ #include <memory> +#import "components/safe_browsing/ios/browser/safe_browsing_url_allow_list.h" #include "components/security_state/core/security_state.h" #include "components/security_state/ios/ssl_status_input_event_data.h" -#import "ios/chrome/browser/safe_browsing/safe_browsing_url_allow_list.h" #include "ios/web/public/navigation/navigation_item.h" #import "ios/web/public/navigation/navigation_manager.h" #include "ios/web/public/security/security_style.h" diff --git a/chromium/components/security_state/ios/security_state_utils_unittest.mm b/chromium/components/security_state/ios/security_state_utils_unittest.mm index dc66ae4fa8b..e6a1544e8b3 100644 --- a/chromium/components/security_state/ios/security_state_utils_unittest.mm +++ b/chromium/components/security_state/ios/security_state_utils_unittest.mm @@ -4,9 +4,9 @@ #include "components/security_state/ios/security_state_utils.h" +#import "components/safe_browsing/ios/browser/safe_browsing_url_allow_list.h" #include "components/security_state/core/security_state.h" #import "components/security_state/ios/insecure_input_tab_helper.h" -#import "ios/chrome/browser/safe_browsing/safe_browsing_url_allow_list.h" #import "ios/web/public/navigation/navigation_item.h" #import "ios/web/public/navigation/navigation_manager.h" #include "ios/web/public/security/ssl_status.h" |