Introduce subresource_filter::ConfigurationList and make querying it cheap.

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/feature_list.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/rand_util.h"
 #include "base/time/time.h"
@@ skipping 68 matching lines @@
     ui::PageTransition transition) {
   return ui::PageTransitionCoreTypeIs(transition, ui::PAGE_TRANSITION_RELOAD) ||
          // Some pages 'reload' from JavaScript by navigating to themselves.
          url == referrer.url;
 }
 
 ContentSubresourceFilterDriverFactory::ContentSubresourceFilterDriverFactory(
     content::WebContents* web_contents,
     std::unique_ptr<SubresourceFilterClient> client)
     : content::WebContentsObserver(web_contents),
-      configuration_(GetActiveConfiguration()),
       client_(std::move(client)),
       throttle_manager_(
           base::MakeUnique<ContentSubresourceFilterThrottleManager>(
               this,
               client_->GetRulesetDealer(),
               web_contents)),
       activation_level_(ActivationLevel::DISABLED),
       activation_decision_(ActivationDecision::UNKNOWN),
       measure_performance_(false) {}
 
 ContentSubresourceFilterDriverFactory::
     ~ContentSubresourceFilterDriverFactory() {}
 
 void ContentSubresourceFilterDriverFactory::
     OnMainResourceMatchedSafeBrowsingBlacklist(
         const GURL& url,
         const std::vector<GURL>& redirect_urls,
         safe_browsing::SBThreatType threat_type,
         safe_browsing::ThreatPatternType threat_type_metadata) {
   AddActivationListMatch(
       url, GetListForThreatTypeAndMetadata(threat_type, threat_type_metadata));
 }
 
 ContentSubresourceFilterDriverFactory::ActivationDecision
 ContentSubresourceFilterDriverFactory::
     ComputeActivationDecisionForMainFrameNavigation(
         content::NavigationHandle* navigation_handle) const {
   const GURL& url(navigation_handle->GetURL());
-  if (configuration_.activation_level == ActivationLevel::DISABLED)
+
+  auto configurations = GetActiveConfigurations();

[Sorin Jianu, 2017/04/24 21:58:59]

const?

Also, please review the similar call sites below.

[engedy, 2017/04/25 08:34:24]

Done.

+  if (configurations->the_one_and_only().activation_level ==
+      ActivationLevel::DISABLED)
     return ActivationDecision::ACTIVATION_DISABLED;
 
-  if (configuration_.activation_scope == ActivationScope::NO_SITES)
+  if (configurations->the_one_and_only().activation_scope ==
+      ActivationScope::NO_SITES)
     return ActivationDecision::ACTIVATION_DISABLED;
 
   if (!url.SchemeIsHTTPOrHTTPS())
     return ActivationDecision::UNSUPPORTED_SCHEME;
   // TODO(csharrison): The throttle manager also performs this check. Remove
   // this one when the activation decision is sent directly to the throttle
   // manager.
   if (client_->ShouldSuppressActivation(navigation_handle))
     return ActivationDecision::URL_WHITELISTED;
 
-  switch (configuration_.activation_scope) {
+  switch (configurations->the_one_and_only().activation_scope) {
     case ActivationScope::ALL_SITES:
       return ActivationDecision::ACTIVATED;
     case ActivationScope::ACTIVATION_LIST: {
       // The logic to ensure only http/https URLs are activated lives in
       // AddActivationListMatch to ensure the activation list only has relevant
       // entries.
       DCHECK(url.SchemeIsHTTPOrHTTPS() ||
-             !DidURLMatchActivationList(url, configuration_.activation_list));
-      bool should_activate =
-          DidURLMatchActivationList(url, configuration_.activation_list);
-      if (configuration_.activation_list ==
+             !DidURLMatchActivationList(
+                 url, configurations->the_one_and_only().activation_list));
+      bool should_activate = DidURLMatchActivationList(
+          url, configurations->the_one_and_only().activation_list);
+      if (configurations->the_one_and_only().activation_list ==
           ActivationList::PHISHING_INTERSTITIAL) {
         // Handling special case, where activation on the phishing sites also
         // mean the activation on the sites with social engineering metadata.
         should_activate |= DidURLMatchActivationList(
             url, ActivationList::SOCIAL_ENG_ADS_INTERSTITIAL);
       }
       return should_activate ? ActivationDecision::ACTIVATED
                              : ActivationDecision::ACTIVATION_LIST_NOT_MATCHED;
     }
     default:
@@ skipping 24 matching lines @@
       navigation_handle->GetNetErrorCode() != net::OK) {
     return;
   }
 
   const GURL& url = navigation_handle->GetURL();
   const content::Referrer& referrer = navigation_handle->GetReferrer();
   ui::PageTransition transition = navigation_handle->GetPageTransition();
 
   RecordRedirectChainMatchPattern();
 
-  if (configuration_.should_whitelist_site_on_reload &&
+  auto configurations = GetActiveConfigurations();
+  if (configurations->the_one_and_only().should_whitelist_site_on_reload &&
       NavigationIsPageReload(url, referrer, transition)) {
     // Whitelist this host for the current as well as subsequent navigations.
     client_->WhitelistInCurrentWebContents(url);
   }
 
   activation_decision_ =
       ComputeActivationDecisionForMainFrameNavigation(navigation_handle);
   DCHECK(activation_decision_ != ActivationDecision::UNKNOWN);
   if (activation_decision_ != ActivationDecision::ACTIVATED) {
     ResetActivationState();
     return;
   }
 
-  activation_level_ = configuration_.activation_level;
-  measure_performance_ = activation_level_ != ActivationLevel::DISABLED &&
-                         ShouldMeasurePerformanceForPageLoad(
-                             configuration_.performance_measurement_rate);
+  activation_level_ = configurations->the_one_and_only().activation_level;
+  measure_performance_ =
+      activation_level_ != ActivationLevel::DISABLED &&
+      ShouldMeasurePerformanceForPageLoad(
+          configurations->the_one_and_only().performance_measurement_rate);
   ActivationState state = ActivationState(activation_level_);
   state.measure_performance = measure_performance_;
   throttle_manager_->NotifyPageActivationComputed(navigation_handle, state);
 }
 
 void ContentSubresourceFilterDriverFactory::OnFirstSubresourceLoadDisallowed() {
-  if (configuration_.should_suppress_notifications)
+  auto configurations = GetActiveConfigurations();
+  if (configurations->the_one_and_only().should_suppress_notifications)
     return;
 
   client_->ToggleNotificationVisibility(activation_level_ ==
                                         ActivationLevel::ENABLED);
 }
 
 bool ContentSubresourceFilterDriverFactory::ShouldSuppressActivation(
     content::NavigationHandle* navigation_handle) {
   return client_->ShouldSuppressActivation(navigation_handle);
 }
@@ skipping 98 matching lines @@
       REPORT_REDIRECT_PATTERN_FOR_SUFFIX("SubresourceFilterOnly", hits_pattern,
                                          chain_size);
       break;
     default:
       NOTREACHED();
       break;
   }
 }
 
 }  // namespace subresource_filter