[subresource_filter] Remove some state from the driver factory

components/subresource_filter/content/browser/content_subresource_filter_throttle_manager_unittest.cc

 // Copyright 2017 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_throttle_manager.h"
 
+#include <map>
 #include <memory>
+#include <set>
+#include <tuple>
 #include <utility>
 
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "base/run_loop.h"
 #include "base/strings/stringprintf.h"
 #include "base/test/test_simple_task_runner.h"
 #include "components/subresource_filter/content/browser/async_document_subresource_filter.h"
 #include "components/subresource_filter/content/common/subresource_filter_messages.h"
 #include "components/subresource_filter/core/common/activation_level.h"
@@ skipping 58 matching lines @@
   const char* GetNameForLogging() override {
     return "MockPageStateActivationThrottle";
   }
 
  private:
   content::NavigationThrottle::ThrottleCheckResult MaybeNotifyActivation(
       PageActivationNotificationTiming throttle_state) {
     if (throttle_state == activation_throttle_state_) {
       auto it = mock_page_activations_.find(navigation_handle()->GetURL());
       if (it != mock_page_activations_.end()) {
-        throttle_manager_->NotifyPageActivationComputed(navigation_handle(),
-                                                        it->second);
+        throttle_manager_->NotifyPageActivationComputed(
+            navigation_handle(), it->second, ActivationDecision::ACTIVATED);
+      } else {
+        throttle_manager_->NotifyPageActivationComputed(
+            navigation_handle(), ActivationState(ActivationLevel::DISABLED),
+            ActivationDecision::ACTIVATION_LIST_NOT_MATCHED);
       }
     }
     return content::NavigationThrottle::PROCEED;
   }
 
   std::map<GURL, ActivationState> mock_page_activations_;
   PageActivationNotificationTiming activation_throttle_state_;
   ContentSubresourceFilterThrottleManager* throttle_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(MockPageStateActivationThrottle);
@@ skipping 155 matching lines @@
       content::NavigationHandle* navigation_handle) override {
     if (navigation_handle->IsSameDocument())
       return;
 
     // Inject the proper throttles at this time.
     std::vector<std::unique_ptr<content::NavigationThrottle>> throttles;
     PageActivationNotificationTiming state =
         ::testing::UnitTest::GetInstance()->current_test_info()->value_param()
             ? GetParam()
             : WILL_PROCESS_RESPONSE;
-    throttles.push_back(base::MakeUnique<MockPageStateActivationThrottle>(
-        navigation_handle, state, throttle_manager_.get()));
+    if (navigation_handle->IsInMainFrame()) {
+      throttles.push_back(base::MakeUnique<MockPageStateActivationThrottle>(
+          navigation_handle, state, throttle_manager_.get()));
+    }
     throttle_manager_->MaybeAppendNavigationThrottles(navigation_handle,
                                                       &throttles);
     for (auto& it : throttles) {
       navigation_handle->RegisterThrottleForTesting(std::move(it));
     }
   }
 
   // ContentSubresourceFilterThrottleManager::Delegate:
   void OnFirstSubresourceLoadDisallowed() override {
     ++disallowed_notification_count_;
@@ skipping 419 matching lines @@
   EXPECT_EQ(0, disallowed_notification_count());
   EXPECT_EQ(1, attempted_frame_activations());
 }
 
 // TODO(csharrison): Make sure the following conditions are exercised in tests:
 //
 // - Synchronous navigations to about:blank. These hit issues with the
 //   NavigationSimulator currently.
 
 }  // namespace subresource_filter