| Index: chrome/browser/safe_browsing/ui_manager.cc
|
| diff --git a/chrome/browser/safe_browsing/ui_manager.cc b/chrome/browser/safe_browsing/ui_manager.cc
|
| index b50e3e3c5c6bb2ea5874e7b23b1a0f4d7e8e1094..a84fa34140d762e6480dddd5cad451d1423520a8 100644
|
| --- a/chrome/browser/safe_browsing/ui_manager.cc
|
| +++ b/chrome/browser/safe_browsing/ui_manager.cc
|
| @@ -117,13 +117,9 @@ void SafeBrowsingUIManager::DisplayBlockingPage(
|
| }
|
| }
|
|
|
| - // For M40, the UwS warning may be gated to not show any UI.
|
| - const bool ping_only = resource.threat_type == SB_THREAT_TYPE_URL_UNWANTED
|
| - && safe_browsing_util::GetUnwantedTrialGroup() < safe_browsing_util::UWS_ON;
|
| -
|
| // Indicate to interested observers that the resource in question matched the
|
| - // SB filters, unless the UwS interstitial is in ping-only mode.
|
| - if (resource.threat_type != SB_THREAT_TYPE_SAFE && !ping_only) {
|
| + // SB filters.
|
| + if (resource.threat_type != SB_THREAT_TYPE_SAFE) {
|
| FOR_EACH_OBSERVER(Observer, observer_list_, OnSafeBrowsingMatch(resource));
|
| }
|
|
|
| @@ -179,15 +175,6 @@ void SafeBrowsingUIManager::DisplayBlockingPage(
|
| std::string() /* post_data */);
|
| }
|
|
|
| - // If UwS interstitials are turned off, return here before showing UI.
|
| - if (ping_only) {
|
| - if (!resource.callback.is_null()) {
|
| - BrowserThread::PostTask(
|
| - BrowserThread::IO, FROM_HERE, base::Bind(resource.callback, true));
|
| - }
|
| - return;
|
| - }
|
| -
|
| if (resource.threat_type != SB_THREAT_TYPE_SAFE) {
|
| FOR_EACH_OBSERVER(Observer, observer_list_, OnSafeBrowsingHit(resource));
|
| }
|
|
|