[subresource_filter] Use the SubresourceFilterObserver for PageLoadMetrics

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/memory/ptr_util.h"
 #include "base/rand_util.h"
 #include "base/time/time.h"
 #include "components/subresource_filter/content/browser/subresource_filter_client.h"
@@ skipping 55 matching lines @@
     ActivationDecision activation_decision,
     Configuration::ActivationOptions matched_options) {
   DCHECK(navigation_handle->IsInMainFrame());
   DCHECK(!navigation_handle->IsSameDocument());
   if (navigation_handle->GetNetErrorCode() != net::OK)
     return;
 
   activation_decision_ = activation_decision;
   activation_options_ = matched_options;
   DCHECK_NE(activation_decision_, ActivationDecision::UNKNOWN);
-  if (activation_decision_ != ActivationDecision::ACTIVATED) {
-    DCHECK_EQ(activation_options_.activation_level, ActivationLevel::DISABLED);
-    return;
-  }
 
-  DCHECK_NE(activation_options_.activation_level, ActivationLevel::DISABLED);
+  // ACTIVATION_DISABLED implies DISABLED activation level.
+  DCHECK(activation_decision_ != ActivationDecision::ACTIVATION_DISABLED ||
+         activation_options_.activation_level == ActivationLevel::DISABLED);
   ActivationState state = ActivationState(activation_options_.activation_level);
   state.measure_performance = ShouldMeasurePerformanceForPageLoad(
       activation_options_.performance_measurement_rate);
 
   // TODO(csharrison): Also use metadata returned from the safe browsing filter,
   // when it is available to set enable_logging. Add tests for this behavior.
   state.enable_logging =
       activation_options_.activation_level == ActivationLevel::ENABLED &&
       !activation_options_.should_suppress_notifications &&
       base::FeatureList::IsEnabled(
@@ skipping 25 matching lines @@
   if (navigation_handle->IsInMainFrame() &&
       !navigation_handle->IsSameDocument() &&
       activation_decision_ == ActivationDecision::UNKNOWN &&
       navigation_handle->HasCommitted()) {
     activation_decision_ = ActivationDecision::ACTIVATION_DISABLED;
     activation_options_ = Configuration::ActivationOptions();
   }
 }
 
 }  // namespace subresource_filter