Deprecate ContentSubresourceFilterDriver.

components/subresource_filter/content/browser/content_subresource_filter_driver_factory.cc

 // Copyright 2016 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 "components/subresource_filter/content/browser/content_subresource_filter_driver_factory.h"
 
 #include "base/metrics/histogram_macros.h"
 #include "base/rand_util.h"
 #include "base/time/time.h"
-#include "components/subresource_filter/content/browser/content_subresource_filter_driver.h"
 #include "components/subresource_filter/content/common/subresource_filter_messages.h"
 #include "components/subresource_filter/core/browser/subresource_filter_client.h"
 #include "components/subresource_filter/core/browser/subresource_filter_features.h"
 #include "components/subresource_filter/core/common/activation_list.h"
 #include "components/subresource_filter/core/common/time_measurements.h"
 #include "content/public/browser/navigation_handle.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/web_contents.h"
 #include "ipc/ipc_message_macros.h"
 #include "net/base/net_errors.h"
@@ skipping 49 matching lines @@
   return static_cast<ContentSubresourceFilterDriverFactory*>(
       web_contents->GetUserData(kWebContentsUserDataKey));
 }
 
 ContentSubresourceFilterDriverFactory::ContentSubresourceFilterDriverFactory(
     content::WebContents* web_contents,
     std::unique_ptr<SubresourceFilterClient> client)
     : content::WebContentsObserver(web_contents),
       client_(std::move(client)),
       activation_level_(ActivationLevel::DISABLED),
-      measure_performance_(false) {
-  content::RenderFrameHost* main_frame_host = web_contents->GetMainFrame();
-  if (main_frame_host && main_frame_host->IsRenderFrameLive())
-    CreateDriverForFrameHostIfNeeded(main_frame_host);
-}
+      measure_performance_(false) {}
 
 ContentSubresourceFilterDriverFactory::
     ~ContentSubresourceFilterDriverFactory() {}
 
-void ContentSubresourceFilterDriverFactory::CreateDriverForFrameHostIfNeeded(
-    content::RenderFrameHost* render_frame_host) {
-  auto iterator_and_inserted =
-      frame_drivers_.insert(std::make_pair(render_frame_host, nullptr));
-  if (iterator_and_inserted.second) {
-    iterator_and_inserted.first->second.reset(
-        new ContentSubresourceFilterDriver(render_frame_host));
-  }
-}
-
 void ContentSubresourceFilterDriverFactory::OnFirstSubresourceLoadDisallowed() {
   if (ShouldSuppressNotifications())
     return;
 
   client_->ToggleNotificationVisibility(activation_level_ ==
                                         ActivationLevel::ENABLED);
 }
 
 void ContentSubresourceFilterDriverFactory::OnDocumentLoadStatistics(
     const DocumentLoadStatistics& statistics) {
@@ skipping 63 matching lines @@
 void ContentSubresourceFilterDriverFactory::ActivateForFrameHostIfNeeded(
     content::RenderFrameHost* render_frame_host,
     const GURL& url,
     bool failed_navigation) {
   // PlzNavigate: For failed navigations, ReadyToCommitNavigation is still
   // called, so we end up here; but there is no longer a failed provisional load
   // on the renderer side, so an activation message sent from here would turn on
   // filtering for the subsequent error page load. This is probably harmless,
   // but not sending an activation message is even cleaner.
   if (activation_level_ != ActivationLevel::DISABLED && !failed_navigation) {
-    auto* driver = DriverFromFrameHost(render_frame_host);
-    DCHECK(driver);
-    driver->ActivateForNextCommittedLoad(GetMaximumActivationLevel(),
-                                         measure_performance_);
+    render_frame_host->Send(
+        new SubresourceFilterMsg_ActivateForNextCommittedLoad(
+            render_frame_host->GetRoutingID(), activation_level_,

[Charlie Harrison, 2017/02/15 19:22:23]

Is removing GetMaximumActivationLevel here just a cleanup? Why was this not
originally activation_level_?

[engedy, 2017/02/15 21:36:55]

Yes, the two should always have the same value, so I thought I might as well
clean it up, because calling the helper involves locking, and I was too lazy to
split this one line change into yet another CL.

Thanks for spotting that, though. I will add this to the CL description.

+            measure_performance_));
   }
 }
 
 void ContentSubresourceFilterDriverFactory::OnReloadRequested() {
   UMA_HISTOGRAM_BOOLEAN("SubresourceFilter.Prompt.NumReloads", true);
   const GURL& whitelist_url = web_contents()->GetLastCommittedURL();
   AddHostOfURLToWhitelistSet(whitelist_url);
   web_contents()->GetController().Reload(content::ReloadType::NORMAL, true);
 }
 
-void ContentSubresourceFilterDriverFactory::SetDriverForFrameHostForTesting(
-    content::RenderFrameHost* render_frame_host,
-    std::unique_ptr<ContentSubresourceFilterDriver> driver) {
-  auto iterator_and_inserted =
-      frame_drivers_.insert(std::make_pair(render_frame_host, nullptr));
-  iterator_and_inserted.first->second = std::move(driver);
-}
-
-ContentSubresourceFilterDriver*
-ContentSubresourceFilterDriverFactory::DriverFromFrameHost(
-    content::RenderFrameHost* render_frame_host) {
-  auto iterator = frame_drivers_.find(render_frame_host);
-  return iterator == frame_drivers_.end() ? nullptr : iterator->second.get();
-}
-
 void ContentSubresourceFilterDriverFactory::ResetActivationState() {
   navigation_chain_.clear();
   activation_list_matches_.clear();
   activation_level_ = ActivationLevel::DISABLED;
   measure_performance_ = false;
   aggregated_document_statistics_ = DocumentLoadStatistics();
 }
 
 void ContentSubresourceFilterDriverFactory::DidStartNavigation(
     content::NavigationHandle* navigation_handle) {
   if (navigation_handle->IsInMainFrame() && !navigation_handle->IsSamePage()) {
     ResetActivationState();
     navigation_chain_.push_back(navigation_handle->GetURL());
     client_->ToggleNotificationVisibility(false);
   }
 }
 
 void ContentSubresourceFilterDriverFactory::DidRedirectNavigation(
     content::NavigationHandle* navigation_handle) {
   DCHECK(!navigation_handle->IsSamePage());
   if (navigation_handle->IsInMainFrame())
     navigation_chain_.push_back(navigation_handle->GetURL());
 }
 
-void ContentSubresourceFilterDriverFactory::RenderFrameCreated(
-    content::RenderFrameHost* render_frame_host) {
-  CreateDriverForFrameHostIfNeeded(render_frame_host);
-}
-
-void ContentSubresourceFilterDriverFactory::RenderFrameDeleted(
-    content::RenderFrameHost* render_frame_host) {
-  frame_drivers_.erase(render_frame_host);
-}
-
 void ContentSubresourceFilterDriverFactory::ReadyToCommitNavigation(
     content::NavigationHandle* navigation_handle) {
   DCHECK(!navigation_handle->IsSamePage());
   content::RenderFrameHost* render_frame_host =
       navigation_handle->GetRenderFrameHost();
   GURL url = navigation_handle->GetURL();
   const content::Referrer& referrer = navigation_handle->GetReferrer();
   ui::PageTransition transition = navigation_handle->GetPageTransition();
   ReadyToCommitNavigationInternal(
       render_frame_host, url, referrer, transition,
@@ skipping 129 matching lines @@
   if (!hits_pattern)
     return;
   UMA_HISTOGRAM_ENUMERATION(
       "SubresourceFilter.PageLoad.RedirectChainMatchPattern", hits_pattern,
       0x10 /* max value */);
   UMA_HISTOGRAM_COUNTS("SubresourceFilter.PageLoad.RedirectChainLength",
                        navigation_chain_.size());
 }
 
 }  // namespace subresource_filter