Remove the ad delay throttle

This experiment has been disabled for a while. It should be pretty
easy to reland if we decide we want to do it.

Bug: 829042
Change-Id: I273d7a757312f1628ce3878e266311455eb73eb1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1574281
Commit-Queue: Charlie Harrison <csharrison@chromium.org>
Reviewed-by: Josh Karlin <jkarlin@chromium.org>
Reviewed-by: Avi Drissman <avi@chromium.org>
Auto-Submit: Charlie Harrison <csharrison@chromium.org>
Cr-Commit-Position: refs/heads/master@{#652601}

chrome/renderer/url_loader_throttle_provider_impl.cc

@@ -22,7 +22,6 @@
 #include "components/data_reduction_proxy/core/common/data_reduction_proxy_throttle_manager.h"
 #include "components/safe_browsing/features.h"
 #include "components/safe_browsing/renderer/renderer_url_loader_throttle.h"
-#include "components/subresource_filter/content/renderer/ad_delay_renderer_metadata_provider.h"
 #include "content/public/common/content_features.h"
 #include "content/public/common/service_names.mojom.h"
 #include "content/public/renderer/render_frame.h"
@@ -260,19 +259,6 @@ URLLoaderThrottleProviderImpl::CreateThrottles(
   }
 #endif
 
-  // Initialize the factory here rather than in the constructor, since metrics
-  // does not support registering field trials (as opposed to Features) before
-  // Blink is initialized (after this class).
-  if (!ad_delay_factory_) {
-    ad_delay_factory_ =
-        std::make_unique<subresource_filter::AdDelayThrottle::Factory>();
-  }
-  if (auto ad_throttle = ad_delay_factory_->MaybeCreate(
-          std::make_unique<subresource_filter::AdDelayRendererMetadataProvider>(
-              request, type_, render_frame_id))) {
-    throttles.push_back(std::move(ad_throttle));
-  }
-
   throttles.push_back(std::make_unique<GoogleURLLoaderThrottle>(
       ChromeRenderThreadObserver::is_incognito_process(),
       ChromeRenderThreadObserver::GetDynamicParams()));

chrome/renderer/url_loader_throttle_provider_impl.h

@@ -10,7 +10,6 @@
 
 #include "base/threading/thread_checker.h"
 #include "components/safe_browsing/common/safe_browsing.mojom.h"
-#include "components/subresource_filter/content/common/ad_delay_throttle.h"
 #include "content/public/renderer/url_loader_throttle_provider.h"
 #include "extensions/buildflags/buildflags.h"
 
@@ -48,9 +47,6 @@ class URLLoaderThrottleProviderImpl
   // general use.
   URLLoaderThrottleProviderImpl(const URLLoaderThrottleProviderImpl& other);
 
-  std::unique_ptr<subresource_filter::AdDelayThrottle::Factory>
-      ad_delay_factory_;
-
   content::URLLoaderThrottleProviderType type_;
   ChromeContentRendererClient* const chrome_content_renderer_client_;
 

chrome/test/BUILD.gn

@@ -914,7 +914,6 @@ test("browser_tests") {
       "../browser/ssl/ssl_client_certificate_selector_test.h",
       "../browser/ssl/typed_navigation_timing_throttle_browsertest.cc",
       "../browser/storage/durable_storage_browsertest.cc",
-      "../browser/subresource_filter/ad_delay_browsertest.cc",
       "../browser/subresource_filter/ad_tagging_browsertest.cc",
       "../browser/subresource_filter/ruleset_browsertest.cc",
       "../browser/subresource_filter/subresource_filter_browser_test_harness.cc",

components/subresource_filter/content/common/BUILD.gn

@@ -4,8 +4,6 @@
 
 static_library("common") {
   sources = [
-    "ad_delay_throttle.cc",
-    "ad_delay_throttle.h",
     "ruleset_dealer.cc",
     "ruleset_dealer.h",
     "subresource_filter_message_generator.cc",
@@ -27,7 +25,6 @@ static_library("common") {
 source_set("unit_tests") {
   testonly = true
   sources = [
-    "ad_delay_throttle_unittest.cc",
     "ruleset_dealer_unittest.cc",
   ]
   deps = [