Remove the finch gate from the UWS interstitial

chrome/browser/safe_browsing/ui_manager.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/safe_browsing/ui_manager.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/debug/leak_tracker.h"
@@ skipping 99 matching lines @@
          proto.ParseFromString(resource.threat_metadata) &&
          proto.pattern_type() == safe_browsing::MalwarePatternType::LANDING)) {
       if (!resource.callback.is_null()) {
         BrowserThread::PostTask(
             BrowserThread::IO, FROM_HERE, base::Bind(resource.callback, true));
       }
       return;
     }
   }
 
-  // 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));
   }
 
   // Check if the user has already ignored our warning for this render_view
   // and domain.
   if (IsWhitelisted(resource)) {
     if (!resource.callback.is_null()) {
       BrowserThread::PostTask(
           BrowserThread::IO, FROM_HERE, base::Bind(resource.callback, true));
     }
@@ skipping 35 matching lines @@
         !resource.original_url.is_empty() &&
         resource.original_url != resource.url) {
       referrer_url = page_url;
       page_url = resource.original_url;
     }
     ReportSafeBrowsingHit(resource.url, page_url, referrer_url,
                           resource.is_subresource, resource.threat_type,
                           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));
   }
   SafeBrowsingBlockingPage::ShowBlockingPage(this, resource);
 }
 
 // A safebrowsing hit is sent after a blocking page for malware/phishing
 // or after the warning dialog for download urls, only for UMA users.
 void SafeBrowsingUIManager::ReportSafeBrowsingHit(
     const GURL& malicious_url,
@@ skipping 125 matching lines @@
          (entry.threat_type == SB_THREAT_TYPE_CLIENT_SIDE_MALWARE_URL &&
           resource.threat_type == SB_THREAT_TYPE_URL_MALWARE))) {
       return entry.domain ==
           net::registry_controlled_domains::GetDomainAndRegistry(
               resource.url,
               net::registry_controlled_domains::EXCLUDE_PRIVATE_REGISTRIES);
     }
   }
   return false;
 }