Commit 37e8140a authored by Nate Fischer's avatar Nate Fischer Committed by Commit Bot

AW NS: remove kCheckByURLLoaderThrottle

No change to behavior.

This removes the kCheckByURLLoaderThrottle feature. This feature was
only relevant when Network Service was disabled. Since NS is enabled for
all platforms (and the legacy net path is no longer supported), we can
remove the feature entirely.

Bug: 989709
Test: double-check WebView safe browsing still works with the demo app
Change-Id: Ia62c503b66b30c97571e8fbc2ce351962f8b7b19
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1732391
Auto-Submit: Nate Fischer <ntfschr@chromium.org>
Reviewed-by: default avatarNathan Parker <nparker@chromium.org>
Commit-Queue: Nate Fischer <ntfschr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#683725}
parent 92a59bd6
...@@ -1866,7 +1866,6 @@ IN_PROC_BROWSER_TEST_P(SafeBrowsingBlockingPageBrowserTest, ...@@ -1866,7 +1866,6 @@ IN_PROC_BROWSER_TEST_P(SafeBrowsingBlockingPageBrowserTest,
base::test::ScopedFeatureList feature_list; base::test::ScopedFeatureList feature_list;
std::vector<base::Feature> enable; std::vector<base::Feature> enable;
enable.push_back(kCommittedSBInterstitials); enable.push_back(kCommittedSBInterstitials);
enable.push_back(kCheckByURLLoaderThrottle);
feature_list.InitWithFeatures(enable, std::vector<base::Feature>()); feature_list.InitWithFeatures(enable, std::vector<base::Feature>());
SetupWarningAndNavigate(browser()); SetupWarningAndNavigate(browser());
EXPECT_TRUE(IsShowingInterstitial( EXPECT_TRUE(IsShowingInterstitial(
......
...@@ -34,16 +34,6 @@ const base::Feature kCaptureInlineJavascriptForGoogleAds{ ...@@ -34,16 +34,6 @@ const base::Feature kCaptureInlineJavascriptForGoogleAds{
const base::Feature kCaptureSafetyNetId{"SafeBrowsingCaptureSafetyNetId", const base::Feature kCaptureSafetyNetId{"SafeBrowsingCaptureSafetyNetId",
base::FEATURE_DISABLED_BY_DEFAULT}; base::FEATURE_DISABLED_BY_DEFAULT};
// If enabled in pre-network-service world, SafeBrowsing URL checks are done by
// applying SafeBrowsing's URLLoaderThrottle subclasses to ThrottlingURLLoader.
//
// This flag has no effect if network service is enabled. With network service,
// SafeBrowsing URL checks are always done by SafeBrowsing's URLLoaderThrottle
// subclasses.
const base::Feature kCheckByURLLoaderThrottle{
"S13nSafeBrowsingCheckByURLLoaderThrottle",
base::FEATURE_DISABLED_BY_DEFAULT};
const base::Feature kCommittedSBInterstitials{ const base::Feature kCommittedSBInterstitials{
"SafeBrowsingCommittedInterstitials", base::FEATURE_DISABLED_BY_DEFAULT}; "SafeBrowsingCommittedInterstitials", base::FEATURE_DISABLED_BY_DEFAULT};
...@@ -94,7 +84,6 @@ constexpr struct { ...@@ -94,7 +84,6 @@ constexpr struct {
{&kAdSamplerTriggerFeature, false}, {&kAdSamplerTriggerFeature, false},
{&kCaptureInlineJavascriptForGoogleAds, true}, {&kCaptureInlineJavascriptForGoogleAds, true},
{&kCaptureSafetyNetId, true}, {&kCaptureSafetyNetId, true},
{&kCheckByURLLoaderThrottle, true},
{&kCommittedSBInterstitials, true}, {&kCommittedSBInterstitials, true},
{&kForceUseAPDownloadProtection, false}, {&kForceUseAPDownloadProtection, false},
{&kPasswordProtectionForSignedInUsers, true}, {&kPasswordProtectionForSignedInUsers, true},
......
...@@ -37,8 +37,6 @@ extern const base::Feature kCaptureInlineJavascriptForGoogleAds; ...@@ -37,8 +37,6 @@ extern const base::Feature kCaptureInlineJavascriptForGoogleAds;
// a SBER user downloads an APK file. // a SBER user downloads an APK file.
extern const base::Feature kCaptureSafetyNetId; extern const base::Feature kCaptureSafetyNetId;
extern const base::Feature kCheckByURLLoaderThrottle;
// Controls if safe browsing interstitials are implemented as committed // Controls if safe browsing interstitials are implemented as committed
// navigations instead of overlays. // navigations instead of overlays.
extern const base::Feature kCommittedSBInterstitials; extern const base::Feature kCommittedSBInterstitials;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment