Make Safe Browsing Subresource Filter tests truly end-to-end.

chrome/browser/safe_browsing/safe_browsing_service_browsertest.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.
 //
 // This test creates a safebrowsing service using test safebrowsing database
 // and a test protocol manager. It is used to test logics in safebrowsing
 // service.
 
 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
 
@@ skipping 21 matching lines @@
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
 #include "chrome/browser/prerender/prerender_manager.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/safe_browsing/client_side_detection_service.h"
 #include "chrome/browser/safe_browsing/local_database_manager.h"
 #include "chrome/browser/safe_browsing/protocol_manager.h"
 #include "chrome/browser/safe_browsing/safe_browsing_database.h"
 #include "chrome/browser/safe_browsing/test_safe_browsing_service.h"
 #include "chrome/browser/safe_browsing/ui_manager.h"
+#include "chrome/browser/subresource_filter/test_ruleset_publisher.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_navigator_params.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "components/bookmarks/browser/startup_task_runner_service.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "components/prefs/pref_service.h"
 #include "components/safe_browsing/common/safebrowsing_switches.h"
 #include "components/safe_browsing_db/database_manager.h"
 #include "components/safe_browsing_db/metadata.pb.h"
 #include "components/safe_browsing_db/test_database_manager.h"
 #include "components/safe_browsing_db/util.h"
 #include "components/safe_browsing_db/v4_database.h"
 #include "components/safe_browsing_db/v4_feature_list.h"
 #include "components/safe_browsing_db/v4_get_hash_protocol_manager.h"
 #include "components/safe_browsing_db/v4_protocol_manager_util.h"
 #include "components/subresource_filter/content/browser/content_subresource_filter_driver.h"
 #include "components/subresource_filter/content/browser/content_subresource_filter_driver_factory.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/interstitial_page.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/web_contents.h"
+#include "content/public/common/content_switches.h"
 #include "content/public/test/browser_test_utils.h"
 #include "crypto/sha2.h"
 #include "net/cookies/cookie_store.h"
 #include "net/cookies/cookie_util.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
 #include "net/test/embedded_test_server/http_request.h"
 #include "net/test/embedded_test_server/http_response.h"
 #include "sql/connection.h"
 #include "sql/statement.h"
 #include "testing/gmock/include/gmock/gmock.h"
@@ skipping 24 matching lines @@
 const char kMaliciousResource[] = "/malware/script.js";
 const char kMalwareFile[] = "/downloads/dangerous/dangerous.exe";
 const char kMalwarePage[] = "/safe_browsing/malware.html";
 const char kMalwareDelayedLoadsPage[] =
     "/safe_browsing/malware_delayed_loads.html";
 const char kMalwareIFrame[] = "/safe_browsing/malware_iframe.html";
 const char kMalwareImg[] = "/safe_browsing/malware_image.png";
 const char kNeverCompletesPath[] = "/never_completes";
 const char kPrefetchMalwarePage[] = "/safe_browsing/prefetch_malware.html";
 
-class MockSubresourceFilterDriver
-    : public subresource_filter::ContentSubresourceFilterDriver {
- public:
-  explicit MockSubresourceFilterDriver(
-      content::RenderFrameHost* render_frame_host)
-      : subresource_filter::ContentSubresourceFilterDriver(render_frame_host) {}
-
-  ~MockSubresourceFilterDriver() override = default;
-
-  MOCK_METHOD2(ActivateForNextCommittedLoad,
-               void(subresource_filter::ActivationLevel, bool));
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(MockSubresourceFilterDriver);
-};
-
 class NeverCompletingHttpResponse : public net::test_server::HttpResponse {
  public:
   ~NeverCompletingHttpResponse() override {}
 
   void SendResponse(
       const net::test_server::SendBytesCallback& send,
       const net::test_server::SendCompleteCallback& done) override {
     // Do nothing. |done| is never called.
   }
 };
@@ skipping 407 matching lines @@
     SafeBrowsingDatabase::RegisterFactory(nullptr);
     SafeBrowsingProtocolManager::RegisterFactory(nullptr);
     SafeBrowsingService::RegisterFactory(nullptr);
   }
 
   void SetUpCommandLine(base::CommandLine* command_line) override {
     // Makes sure the auto update is not triggered during the test.
     // This test will fill up the database using testing prefixes
     // and urls.
     command_line->AppendSwitch(safe_browsing::switches::kSbDisableAutoUpdate);
+    command_line->AppendSwitchASCII(
+        ::switches::kEnableFeatures,
+        subresource_filter::kSafeBrowsingSubresourceFilter.name);
 #if defined(OS_CHROMEOS)
     command_line->AppendSwitch(
         chromeos::switches::kIgnoreUserProfileMappingForTests);
 #endif
   }
 
   void SetUpOnMainThread() override {
     InProcessBrowserTest::SetUpOnMainThread();
     g_browser_process->safe_browsing_service()->ui_manager()->AddObserver(
         &observer_);
-    WebContents* contents =
-        browser()->tab_strip_model()->GetActiveWebContents();
-    driver_ = new MockSubresourceFilterDriver(contents->GetMainFrame());
-    factory()->SetDriverForFrameHostForTesting(contents->GetMainFrame(),
-                                               base::WrapUnique(driver()));
-  }
-
-  subresource_filter::ContentSubresourceFilterDriverFactory* factory() {
-    WebContents* contents =
-        browser()->tab_strip_model()->GetActiveWebContents();
-    return subresource_filter::ContentSubresourceFilterDriverFactory::
-        FromWebContents(contents);
   }
 
   void TearDownOnMainThread() override {
     g_browser_process->safe_browsing_service()->ui_manager()->RemoveObserver(
         &observer_);
     InProcessBrowserTest::TearDownOnMainThread();
   }
 
   void SetUpInProcessBrowserTestFixture() override {
     base::FilePath test_data_dir;
@@ skipping 20 matching lines @@
     pm->AddGetFullHashResponse(full_hash);
   }
 
   bool ShowingInterstitialPage() {
     WebContents* contents =
         browser()->tab_strip_model()->GetActiveWebContents();
     InterstitialPage* interstitial_page = contents->GetInterstitialPage();
     return interstitial_page != nullptr;
   }
 
+  bool WasSubresourceFilterProbeScriptLoaded() {
+    bool script_resource_was_loaded = false;
+    WebContents* web_contents =
+        browser()->tab_strip_model()->GetActiveWebContents();
+    EXPECT_TRUE(content::ExecuteScriptAndExtractBool(
+        web_contents->GetMainFrame(),
+        "domAutomationController.send(!!document.scriptExecuted)",
+        &script_resource_was_loaded));
+    return script_resource_was_loaded;
+  }
+
   void IntroduceGetHashDelay(const base::TimeDelta& delay) {
     pm_factory_.GetProtocolManager()->IntroduceDelay(delay);
   }
 
   // TODO(nparker): Remove the need for this by wiring in our own
   // SafeBrowsingDatabaseManager factory and keep a ptr to the subclass.
   // Or add a Get/SetTimeout to sbdbmgr.
   static LocalSafeBrowsingDatabaseManager* LocalDatabaseManagerForService(
       SafeBrowsingService* sb_service) {
     return static_cast<LocalSafeBrowsingDatabaseManager*>(
@@ skipping 24 matching lines @@
 
   FakeSafeBrowsingUIManager* ui_manager() {
     return static_cast<FakeSafeBrowsingUIManager*>(
         g_browser_process->safe_browsing_service()->ui_manager().get());
   }
   bool got_hit_report() { return ui_manager()->got_hit_report_; }
   const safe_browsing::HitReport& hit_report() {
     return ui_manager()->hit_report_;
   }
 
-  MockSubresourceFilterDriver* driver() { return driver_; }
-
  protected:
   StrictMock<MockObserver> observer_;
 
   // Temporary profile dir for test cases that create a second profile.  This is
   // owned by the SafeBrowsingServiceTest object so that it will not get
   // destructed until after the test Browser has been torn down, since the
   // ImportantFileWriter may still be modifying it after the Profile object has
   // been destroyed.
   base::ScopedTempDir temp_profile_dir_;
 
@@ skipping 20 matching lines @@
         service, enabled,
         BrowserThread::GetTaskRunnerForThread(BrowserThread::IO).get()));
     ASSERT_TRUE(enabled_helper->Run());
   }
 
  protected:
   std::unique_ptr<TestSafeBrowsingServiceFactory> sb_factory_;
   TestSafeBrowsingDatabaseFactory db_factory_;
   TestSBProtocolManagerFactory pm_factory_;
 
-  // Owned by ContentSubresourceFilterFactory.
-  MockSubresourceFilterDriver* driver_;
-
  private:
   DISALLOW_COPY_AND_ASSIGN(SafeBrowsingServiceTest);
 };
 
 class SafeBrowsingServiceMetadataTest
     : public SafeBrowsingServiceTest,
       public ::testing::WithParamInterface<ThreatPatternType> {
  public:
   SafeBrowsingServiceMetadataTest() {}
 
@@ skipping 196 matching lines @@
   ui_test_utils::NavigateToURL(&params);
 
   EXPECT_TRUE(ShowingInterstitialPage());
   EXPECT_TRUE(got_hit_report());
   EXPECT_EQ(bad_url, hit_report().malicious_url);
   EXPECT_EQ(bad_url, hit_report().page_url);
   EXPECT_EQ(first_url, hit_report().referrer_url);
   EXPECT_FALSE(hit_report().is_subresource);
 }
 
-IN_PROC_BROWSER_TEST_F(SafeBrowsingServiceTest,
-                       SocEngReportingBlacklistNotEmpty) {
+IN_PROC_BROWSER_TEST_F(SafeBrowsingServiceTest, SubresourceFilterEndToEndTest) {
   subresource_filter::testing::ScopedSubresourceFilterFeatureToggle
       scoped_feature_toggle(
           base::FeatureList::OVERRIDE_ENABLE_FEATURE,
           subresource_filter::kActivationLevelEnabled,
           subresource_filter::kActivationScopeActivationList,
           subresource_filter::kActivationListSocialEngineeringAdsInterstitial);
-  // Tests that when Safe Browsing gets hit which is corresponding to the
-  // SOCIAL_ENGINEERING_ADS threat type, then URL is added to the Subresource
-  // Filter.
-  GURL bad_url = embedded_test_server()->GetURL(kMalwarePage);
 
+  subresource_filter::testing::TestRulesetCreator ruleset_creator;
+  subresource_filter::testing::TestRulesetPair test_ruleset_pair;
+  ruleset_creator.CreateRulesetToDisallowURLsWithPathSuffix(
+      "included_script.js", &test_ruleset_pair);
+  subresource_filter::testing::TestRulesetPublisher test_ruleset_publisher;
+  ASSERT_NO_FATAL_FAILURE(
+      test_ruleset_publisher.SetRuleset(test_ruleset_pair.unindexed));
+
+  GURL phishing_url = embedded_test_server()->GetURL(
+      "/subresource_filter/frame_with_included_script.html");
   SBFullHashResult malware_full_hash;
-  GenUrlFullHashResultWithMetadata(bad_url,
-                                   PHISH,
+  GenUrlFullHashResultWithMetadata(phishing_url, PHISH,
                                    ThreatPatternType::SOCIAL_ENGINEERING_ADS,
                                    &malware_full_hash);
-  SetupResponseForUrl(bad_url, malware_full_hash);
+  SetupResponseForUrl(phishing_url, malware_full_hash);
 
-  WebContents* main_contents =
+  // Navigation to a phishing page should trigger an interstitial. If the user
+  // clicks through it, the page load should proceed, but with subresource
+  // filtering activated. This is verified by probing whether `included_script`
+  // that is disallowed above indeed fails to load.
+  WebContents* web_contents =
       browser()->tab_strip_model()->GetActiveWebContents();
+  EXPECT_CALL(observer_, OnSafeBrowsingHit(IsUnsafeResourceFor(phishing_url)));
+  ui_test_utils::NavigateToURL(browser(), phishing_url);
+  ASSERT_TRUE(Mock::VerifyAndClearExpectations(&observer_));
+  ASSERT_TRUE(got_hit_report());
+  content::WaitForInterstitialAttach(web_contents);
+  ASSERT_TRUE(ShowingInterstitialPage());
 
-  EXPECT_CALL(observer_, OnSafeBrowsingHit(IsUnsafeResourceFor(bad_url)))
-      .Times(1);
-  EXPECT_CALL(*driver(), ActivateForNextCommittedLoad(_, _)).Times(0);
-  ui_test_utils::NavigateToURL(browser(), bad_url);
-  Mock::VerifyAndClearExpectations(&observer_);
-  ASSERT_TRUE(got_hit_report());
-
-  content::WaitForInterstitialAttach(main_contents);
-  EXPECT_TRUE(ShowingInterstitialPage());
-  testing::Mock::VerifyAndClearExpectations(driver());
-  EXPECT_CALL(*driver(), ActivateForNextCommittedLoad(_, _)).Times(1);
-  InterstitialPage* interstitial_page = main_contents->GetInterstitialPage();
+  content::WindowedNotificationObserver load_stop_observer(
+      content::NOTIFICATION_LOAD_STOP,
+      content::Source<content::NavigationController>(
+          &web_contents->GetController()));
+  InterstitialPage* interstitial_page = web_contents->GetInterstitialPage();
   ASSERT_TRUE(interstitial_page);
   interstitial_page->Proceed();
-  content::WaitForInterstitialDetach(main_contents);
+  load_stop_observer.Wait();
+  ASSERT_FALSE(ShowingInterstitialPage());
+  EXPECT_FALSE(WasSubresourceFilterProbeScriptLoaded());
+
+  // Navigate to a page that loads the same script, but is not a phishing page.
+  // The load should be allowed.
+  GURL safe_url = embedded_test_server()->GetURL(
+      "/subresource_filter/frame_with_allowed_script.html");
+  ui_test_utils::NavigateToURL(browser(), safe_url);
   EXPECT_FALSE(ShowingInterstitialPage());
-  testing::Mock::VerifyAndClearExpectations(driver());
-}
+  EXPECT_TRUE(WasSubresourceFilterProbeScriptLoaded());
 
-IN_PROC_BROWSER_TEST_F(SafeBrowsingServiceTest, SocEngReportingBlacklistEmpty) {
-  // Tests that URLS which doesn't belong to the SOCIAL_ENGINEERING_ADS threat
-  // type aren't seen by the Subresource Filter.
-  subresource_filter::testing::ScopedSubresourceFilterFeatureToggle
-      scoped_feature_toggle(
-          base::FeatureList::OVERRIDE_ENABLE_FEATURE,
-          subresource_filter::kActivationLevelEnabled,
-          subresource_filter::kActivationScopeNoSites,
-          subresource_filter::kActivationListSocialEngineeringAdsInterstitial);
-
-  GURL bad_url = embedded_test_server()->base_url().Resolve(kMalwarePage);
-
-  SBFullHashResult malware_full_hash;
-  GenUrlFullHashResult(bad_url, MALWARE, &malware_full_hash);
-  SetupResponseForUrl(bad_url, malware_full_hash);
-
-  WebContents* main_contents =
-      browser()->tab_strip_model()->GetActiveWebContents();
-
-  EXPECT_CALL(observer_, OnSafeBrowsingHit(IsUnsafeResourceFor(bad_url)))
-      .Times(1);
-  EXPECT_CALL(*driver(), ActivateForNextCommittedLoad(_, _)).Times(0);
-  ui_test_utils::NavigateToURL(browser(), bad_url);
-  testing::Mock::VerifyAndClearExpectations(driver());
-  ASSERT_TRUE(got_hit_report());
-
-  content::WaitForInterstitialAttach(main_contents);
-  EXPECT_TRUE(ShowingInterstitialPage());
-  testing::Mock::VerifyAndClearExpectations(driver());
-  EXPECT_CALL(*driver(), ActivateForNextCommittedLoad(_, _)).Times(0);
-  InterstitialPage* interstitial_page = main_contents->GetInterstitialPage();
-  ASSERT_TRUE(interstitial_page);
-  interstitial_page->Proceed();
-  content::WaitForInterstitialDetach(main_contents);
+  // Navigate to the phishing page again -- should be no interstitial shown, but
+  // subresource filtering should still be activated.

[Charlie Harrison, 2017/02/15 18:51:21]

The fact that subresource filtering should still be activated is not tested
here, I wonder if you could include both "included_script" and "allowed_script"
on a single page?

[engedy, 2017/02/15 18:55:25]

So it is tested to some degree by line 969, but I agree that having both an
allowed and a disallowed resource would be the ideal solution. 

Given that the subresource_filter_browsertest.cc suffers from this problem too,
I wanted to fix this overall in a separate CL. (Feel free to do so if you are
interested.)

+  EXPECT_CALL(observer_, OnSafeBrowsingHit(IsUnsafeResourceFor(phishing_url)))
+      .Times(0);
+  ui_test_utils::NavigateToURL(browser(), phishing_url);
   EXPECT_FALSE(ShowingInterstitialPage());
-  testing::Mock::VerifyAndClearExpectations(driver());
+  EXPECT_FALSE(WasSubresourceFilterProbeScriptLoaded());
 }
 
 IN_PROC_BROWSER_TEST_F(SafeBrowsingServiceTest,
                        SubResourceHitWithMainFrameReferrer) {
   GURL first_url = embedded_test_server()->GetURL(kEmptyPage);
   GURL second_url = embedded_test_server()->GetURL(kMalwarePage);
   GURL bad_url = embedded_test_server()->GetURL(kMalwareImg);
 
   SBFullHashResult malware_full_hash;
   GenUrlFullHashResult(bad_url, MALWARE, &malware_full_hash);
@@ skipping 1117 matching lines @@
 
   EXPECT_TRUE(ShowingInterstitialPage());
   EXPECT_TRUE(got_hit_report());
   EXPECT_EQ(bad_url, hit_report().malicious_url);
   EXPECT_EQ(bad_url, hit_report().page_url);
   EXPECT_EQ(first_url, hit_report().referrer_url);
   EXPECT_FALSE(hit_report().is_subresource);
 }
 
 IN_PROC_BROWSER_TEST_F(V4SafeBrowsingServiceTest,
-                       SocEngReportingBlacklistNotEmpty) {
+                       SubresourceFilterEndToEndTest) {
   subresource_filter::testing::ScopedSubresourceFilterFeatureToggle
       scoped_feature_toggle(
           base::FeatureList::OVERRIDE_ENABLE_FEATURE,
           subresource_filter::kActivationLevelEnabled,
           subresource_filter::kActivationScopeActivationList,
           subresource_filter::kActivationListSocialEngineeringAdsInterstitial);
-  // Tests that when Safe Browsing gets hit which is corresponding to the
-  // SOCIAL_ENGINEERING_ADS threat type, then URL is added to the Subresource
-  // Filter.
-  GURL bad_url = embedded_test_server()->GetURL(kMalwarePage);
-  MarkUrlForPhishingUnexpired(bad_url,
+
+  subresource_filter::testing::TestRulesetCreator ruleset_creator;
+  subresource_filter::testing::TestRulesetPair test_ruleset_pair;
+  ruleset_creator.CreateRulesetToDisallowURLsWithPathSuffix(
+      "included_script.js", &test_ruleset_pair);
+  subresource_filter::testing::TestRulesetPublisher test_ruleset_publisher;
+  ASSERT_NO_FATAL_FAILURE(
+      test_ruleset_publisher.SetRuleset(test_ruleset_pair.unindexed));
+
+  GURL phishing_url = embedded_test_server()->GetURL(
+      "/subresource_filter/frame_with_included_script.html");
+  MarkUrlForPhishingUnexpired(phishing_url,
                               ThreatPatternType::SOCIAL_ENGINEERING_ADS);
 
-  WebContents* main_contents =
+  // Navigation to a phishing page should trigger an interstitial. If the user
+  // clicks through it, the page load should proceed, but with subresource
+  // filtering activated. This is verified by probing whether `included_script`
+  // that is disallowed above indeed fails to load.
+  WebContents* web_contents =
       browser()->tab_strip_model()->GetActiveWebContents();
+  EXPECT_CALL(observer_, OnSafeBrowsingHit(IsUnsafeResourceFor(phishing_url)));
+  ui_test_utils::NavigateToURL(browser(), phishing_url);
+  ASSERT_TRUE(Mock::VerifyAndClearExpectations(&observer_));
+  ASSERT_TRUE(got_hit_report());
+  content::WaitForInterstitialAttach(web_contents);
+  ASSERT_TRUE(ShowingInterstitialPage());
 
-  EXPECT_CALL(observer_, OnSafeBrowsingHit(IsUnsafeResourceFor(bad_url)))
-      .Times(1);
-  EXPECT_CALL(*driver(), ActivateForNextCommittedLoad(_, _)).Times(0);
-  ui_test_utils::NavigateToURL(browser(), bad_url);
-  Mock::VerifyAndClearExpectations(&observer_);
-  ASSERT_TRUE(got_hit_report());
-
-  content::WaitForInterstitialAttach(main_contents);
-  EXPECT_TRUE(ShowingInterstitialPage());
-  testing::Mock::VerifyAndClearExpectations(driver());
-  EXPECT_CALL(*driver(), ActivateForNextCommittedLoad(_, _)).Times(1);
-  InterstitialPage* interstitial_page = main_contents->GetInterstitialPage();
+  content::WindowedNotificationObserver load_stop_observer(
+      content::NOTIFICATION_LOAD_STOP,
+      content::Source<content::NavigationController>(
+          &web_contents->GetController()));
+  InterstitialPage* interstitial_page = web_contents->GetInterstitialPage();
   ASSERT_TRUE(interstitial_page);
   interstitial_page->Proceed();
-  content::WaitForInterstitialDetach(main_contents);
+  load_stop_observer.Wait();
+  ASSERT_FALSE(ShowingInterstitialPage());
+  EXPECT_FALSE(WasSubresourceFilterProbeScriptLoaded());
+
+  // Navigate to a page that loads the same script, but is not a phishing page.
+  // The load should be allowed.
+  GURL safe_url = embedded_test_server()->GetURL(
+      "/subresource_filter/frame_with_allowed_script.html");
+  ui_test_utils::NavigateToURL(browser(), safe_url);
   EXPECT_FALSE(ShowingInterstitialPage());
-  testing::Mock::VerifyAndClearExpectations(driver());
+  EXPECT_TRUE(WasSubresourceFilterProbeScriptLoaded());
+
+  // Navigate to the phishing page again -- should be no interstitial shown, but
+  // subresource filtering should still be activated.
+  EXPECT_CALL(observer_, OnSafeBrowsingHit(IsUnsafeResourceFor(phishing_url)))
+      .Times(0);
+  ui_test_utils::NavigateToURL(browser(), phishing_url);
+  EXPECT_FALSE(ShowingInterstitialPage());
+  EXPECT_FALSE(WasSubresourceFilterProbeScriptLoaded());
 }
 
 IN_PROC_BROWSER_TEST_F(V4SafeBrowsingServiceTest,
-                       SocEngReportingBlacklistEmpty) {
-  // Tests that URLS which doesn't belong to the SOCIAL_ENGINEERING_ADS threat
-  // type aren't seen by the Subresource Filter.
-  subresource_filter::testing::ScopedSubresourceFilterFeatureToggle
-      scoped_feature_toggle(
-          base::FeatureList::OVERRIDE_ENABLE_FEATURE,
-          subresource_filter::kActivationLevelEnabled,
-          subresource_filter::kActivationScopeNoSites,
-          subresource_filter::kActivationListSocialEngineeringAdsInterstitial);
-
-  GURL bad_url = embedded_test_server()->base_url().Resolve(kMalwarePage);
-  MarkUrlForMalwareUnexpired(bad_url);
-
-  WebContents* main_contents =
-      browser()->tab_strip_model()->GetActiveWebContents();
-
-  EXPECT_CALL(observer_, OnSafeBrowsingHit(IsUnsafeResourceFor(bad_url)))
-      .Times(1);
-  EXPECT_CALL(*driver(), ActivateForNextCommittedLoad(_, _)).Times(0);
-  ui_test_utils::NavigateToURL(browser(), bad_url);
-  testing::Mock::VerifyAndClearExpectations(driver());
-  ASSERT_TRUE(got_hit_report());
-
-  content::WaitForInterstitialAttach(main_contents);
-  EXPECT_TRUE(ShowingInterstitialPage());
-  testing::Mock::VerifyAndClearExpectations(driver());
-  EXPECT_CALL(*driver(), ActivateForNextCommittedLoad(_, _)).Times(0);
-  InterstitialPage* interstitial_page = main_contents->GetInterstitialPage();
-  ASSERT_TRUE(interstitial_page);
-  interstitial_page->Proceed();
-  content::WaitForInterstitialDetach(main_contents);
-  EXPECT_FALSE(ShowingInterstitialPage());
-  testing::Mock::VerifyAndClearExpectations(driver());
-}
-
-IN_PROC_BROWSER_TEST_F(V4SafeBrowsingServiceTest,
                        SubResourceHitWithMainFrameReferrer) {
   GURL first_url = embedded_test_server()->GetURL(kEmptyPage);
   GURL second_url = embedded_test_server()->GetURL(kMalwarePage);
   GURL bad_url = embedded_test_server()->GetURL(kMalwareImg);
 
   MarkUrlForMalwareUnexpired(bad_url);
 
   // Navigate to first, safe page.
   ui_test_utils::NavigateToURL(browser(), first_url);
   EXPECT_FALSE(ShowingInterstitialPage());
@@ skipping 436 matching lines @@
 }
 
 INSTANTIATE_TEST_CASE_P(
     MaybeSetMetadata,
     V4SafeBrowsingServiceMetadataTest,
     testing::Values(ThreatPatternType::NONE,
                     ThreatPatternType::MALWARE_LANDING,
                     ThreatPatternType::MALWARE_DISTRIBUTION));
 
 }  // namespace safe_browsing