Wire up the ThrottleManager using the existing page activation logic

chrome/browser/chrome_content_browser_client.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/chrome_content_browser_client.h"
 
 #include <map>
 #include <set>
 #include <utility>
 #include <vector>
@@ skipping 129 matching lines @@
 #include "components/prefs/pref_service.h"
 #include "components/prefs/scoped_user_pref_update.h"
 #include "components/rappor/public/rappor_utils.h"
 #include "components/rappor/rappor_recorder_impl.h"
 #include "components/rappor/rappor_service_impl.h"
 #include "components/safe_browsing_db/safe_browsing_prefs.h"
 #include "components/security_interstitials/core/ssl_error_ui.h"
 #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"
 #include "components/url_formatter/url_fixer.h"
 #include "components/variations/variations_associated_data.h"
 #include "components/version_info/version_info.h"
 #include "content/public/browser/browser_child_process_host.h"
 #include "content/public/browser/browser_main_parts.h"
 #include "content/public/browser/browser_ppapi_host.h"
 #include "content/public/browser/browser_thread.h"
@@ skipping 3297 matching lines @@
     throttles.push_back(std::move(delay_navigation_throttle));
 
   content::NavigationThrottle* subresource_filter_activation_throttle =
       MaybeCreateSubresourceFilterNavigationThrottle(
           handle, g_browser_process->safe_browsing_service());
   if (subresource_filter_activation_throttle) {
     throttles.push_back(
         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;
 }
 
 std::unique_ptr<content::NavigationUIData>
 ChromeContentBrowserClient::GetNavigationUIData(
     content::NavigationHandle* navigation_handle) {
   return base::MakeUnique<ChromeNavigationUIData>(navigation_handle);
 }
 
 content::DevToolsManagerDelegate*
@@ skipping 124 matching lines @@
     RedirectNonUINonIOBrowserThreadsToTaskScheduler() {
   return variations::GetVariationParamValue(
              "BrowserScheduler", "RedirectNonUINonIOBrowserThreads") == "true";
 }
 
 // static
 void ChromeContentBrowserClient::SetDefaultQuotaSettingsForTesting(
     const storage::QuotaSettings* settings) {
   g_default_quota_settings = settings;
 }