Wire up the ThrottleManager using the existing page activation logic

chrome/browser/chrome_content_browser_client.cc

Index: chrome/browser/chrome_content_browser_client.cc
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index 6a5b77a8e5dec353bed7435c62b870c190352bf9..58f663654a7920d4035b70bbdf200e214539ebd4 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -147,6 +147,8 @@
 #include "components/signin/core/common/profile_management_switches.h"
 #include "components/spellcheck/spellcheck_build_features.h"
 #include "components/startup_metric_utils/browser/startup_metric_host_impl.h"
+#include "components/subresource_filter/content/browser/content_subresource_filter_driver_factory.h"
+#include "components/subresource_filter/content/browser/content_subresource_filter_throttle_manager.h"
 #include "components/task_scheduler_util/browser/initialization.h"
 #include "components/task_scheduler_util/common/variations_util.h"
 #include "components/translate/core/common/translate_switches.h"
@@ -3464,6 +3466,16 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation(
         base::WrapUnique(subresource_filter_activation_throttle));
   }
 
+  // These throttles must come after the
+  // SubresourceFilterSafeBrowsingActivationThrottle.
+  content::WebContents* web_contents = handle->GetWebContents();
+  if (auto* factory =

[engedy, 2017/04/04 11:36:52]

nit: Can this ever be nullptr?

[Charlie Harrison, 2017/04/04 15:54:00]

I'm pretty sure it can. Embedders of WebContents are not obligated to add tab
helpers. Some WebContents users like reader mode will actually add tab helpers
in the middle of a navigation in some cases.

[engedy, 2017/04/04 17:59:56]

Ah, yes, you are right.

+          subresource_filter::ContentSubresourceFilterDriverFactory::
+              FromWebContents(web_contents)) {
+    factory->throttle_manager()->MaybeAppendNavigationThrottles(handle,
+                                                                &throttles);
+  }
+
   return throttles;
 }