Make ChromeSubresourceFilterClient a WebContentsUserData

chrome/browser/subresource_filter/subresource_filter_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 <memory>
 #include <utility>
 
 #include "base/feature_list.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/metrics/field_trial.h"
 #include "base/run_loop.h"
 #include "base/test/scoped_feature_list.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "chrome/browser/after_startup_task_utils.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/safe_browsing/test_safe_browsing_service.h"
 #include "chrome/browser/subresource_filter/chrome_subresource_filter_client.h"
 #include "chrome/browser/subresource_filter/test_ruleset_publisher.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "components/prefs/testing_pref_service.h"
 #include "components/safe_browsing_db/v4_protocol_manager_util.h"
 #include "components/subresource_filter/content/browser/content_ruleset_service.h"
 #include "components/subresource_filter/content/browser/content_subresource_filter_driver_factory.h"

[engedy, 2017/05/02 12:24:20]

nit: Is this still needed?

[Charlie Harrison, 2017/05/02 16:01:57]

Nope, Done.

 #include "components/subresource_filter/content/browser/fake_safe_browsing_database_manager.h"
 #include "components/subresource_filter/core/browser/ruleset_service.h"
 #include "components/subresource_filter/core/browser/subresource_filter_features.h"
 #include "components/subresource_filter/core/browser/subresource_filter_features_test_support.h"
 #include "components/subresource_filter/core/common/test_ruleset_creator.h"
 #include "content/public/browser/navigation_throttle.h"
 #include "content/public/test/navigation_simulator.h"
 #include "content/public/test/test_renderer_host.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"
@@ skipping 55 matching lines @@
     subresource_filter::testing::TestRulesetPair test_ruleset_pair;
     ruleset_creator.CreateRulesetToDisallowURLsWithPathSuffix(
         "disallowed.html", &test_ruleset_pair);
     subresource_filter::testing::TestRulesetPublisher test_ruleset_publisher;
     ASSERT_NO_FATAL_FAILURE(
         test_ruleset_publisher.SetRuleset(test_ruleset_pair.unindexed));
 
     // Set up the tab helpers.
     InfoBarService::CreateForWebContents(web_contents());
     TabSpecificContentSettings::CreateForWebContents(web_contents());
+    ChromeSubresourceFilterClient::CreateForWebContents(web_contents());
 
-    std::unique_ptr<ChromeSubresourceFilterClient> subresource_filter_client(
-        new ChromeSubresourceFilterClient(web_contents()));
-    client_ = subresource_filter_client.get();
-    subresource_filter::ContentSubresourceFilterDriverFactory::
-        CreateForWebContents(web_contents(),
-                             std::move(subresource_filter_client));
     base::RunLoop().RunUntilIdle();
   }
 
   void TearDown() override {
     fake_safe_browsing_database_ = nullptr;
     TestingBrowserProcess::GetGlobal()->safe_browsing_service()->ShutDown();
 
     // Must explicitly set these to null and pump the run loop to ensure that
     // all cleanup related to these classes actually happens.
     TestingBrowserProcess::GetGlobal()->SetRulesetService(nullptr);
@@ skipping 24 matching lines @@
         content::RenderFrameHostTester::For(parent)->AppendChild("subframe");
     return SimulateNavigateAndCommit(
         GURL("https://example.test/disallowed.html"), subframe);
   }
 
   void ConfigureAsSubresourceFilterOnlyURL(const GURL& url) {
     fake_safe_browsing_database_->AddBlacklistedUrl(
         url, safe_browsing::SB_THREAT_TYPE_SUBRESOURCE_FILTER);
   }
 
-  ChromeSubresourceFilterClient* client() { return client_; }
+  ChromeSubresourceFilterClient* client() {
+    return ChromeSubresourceFilterClient::FromWebContents(web_contents());
+  }
 
  private:
   base::ScopedTempDir ruleset_service_dir_;
   base::FieldTrialList field_trial_list_;
   base::test::ScopedFeatureList scoped_feature_list_;
   std::unique_ptr<
       subresource_filter::testing::ScopedSubresourceFilterFeatureToggle>
       scoped_feature_toggle_;
   TestingPrefServiceSimple pref_service_;
 
   scoped_refptr<FakeSafeBrowsingDatabaseManager> fake_safe_browsing_database_;
 
-  ChromeSubresourceFilterClient* client_ = nullptr;
-
   DISALLOW_COPY_AND_ASSIGN(SubresourceFilterTest);
 };
 
 TEST_F(SubresourceFilterTest, SimpleAllowedLoad) {
   GURL url("https://example.test");
   SimulateNavigateAndCommit(url, main_rfh());
   EXPECT_TRUE(CreateAndNavigateDisallowedSubframe(main_rfh()));
   EXPECT_FALSE(client()->did_show_ui_for_navigation());
 }
 
 TEST_F(SubresourceFilterTest, SimpleDisallowedLoad) {
   GURL url("https://example.test");
   ConfigureAsSubresourceFilterOnlyURL(url);
   SimulateNavigateAndCommit(url, main_rfh());
   EXPECT_FALSE(CreateAndNavigateDisallowedSubframe(main_rfh()));
   EXPECT_TRUE(client()->did_show_ui_for_navigation());
 }