Delete the Safe Browsing V2 interstitial and Finch trial

chrome/browser/safe_browsing/safe_browsing_blocking_page_test.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 fake safebrowsing service, where we can inject
 // malware and phishing urls.  It then uses a real browser to go to
 // these urls, and sends "goback" or "proceed" commands and verifies
 // they work.
 
 #include "base/bind.h"
@@ skipping 287 matching lines @@
 
   FakeMalwareDetails* get_details() {
     return details_;
   }
 
  private:
   FakeMalwareDetails* details_;
 };
 
 // A SafeBrowingBlockingPage class that lets us wait until it's hidden.
-class TestSafeBrowsingBlockingPageV2 : public SafeBrowsingBlockingPageV2 {
- public:
-  TestSafeBrowsingBlockingPageV2(SafeBrowsingUIManager* manager,
-                                 WebContents* web_contents,
-                                 const UnsafeResourceList& unsafe_resources)
-      : SafeBrowsingBlockingPageV2(manager, web_contents, unsafe_resources),
-        wait_for_delete_(false) {
-    // Don't wait the whole 3 seconds for the browser test.
-    malware_details_proceed_delay_ms_ = 100;
-  }
-
-  virtual ~TestSafeBrowsingBlockingPageV2() {
-    LOG(INFO) << __FUNCTION__;
-    if (!wait_for_delete_)
-      return;
-
-    // Notify that we are gone
-    base::MessageLoopForUI::current()->Quit();
-    wait_for_delete_ = false;
-  }
-
-  void WaitForDelete() {
-    LOG(INFO) << __FUNCTION__;
-    wait_for_delete_ = true;
-    content::RunMessageLoop();
-  }
-
-  // InterstitialPageDelegate methods:
-  virtual void CommandReceived(const std::string& command) OVERRIDE {
-    LOG(INFO) << __FUNCTION__ << " " << command;
-    SafeBrowsingBlockingPageV2::CommandReceived(command);
-  }
-  virtual void OnProceed() OVERRIDE {
-    LOG(INFO) << __FUNCTION__;
-    SafeBrowsingBlockingPageV2::OnProceed();
-  }
-  virtual void OnDontProceed() OVERRIDE {
-    LOG(INFO) << __FUNCTION__;
-    SafeBrowsingBlockingPageV2::OnDontProceed();
-  }
-
- private:
-  bool wait_for_delete_;
-};
-
-// A SafeBrowingBlockingPage class that lets us wait until it's hidden.
 class TestSafeBrowsingBlockingPageV3 : public SafeBrowsingBlockingPageV3 {
  public:
   TestSafeBrowsingBlockingPageV3(SafeBrowsingUIManager* manager,
                                  WebContents* web_contents,
                                  const UnsafeResourceList& unsafe_resources)
       : SafeBrowsingBlockingPageV3(manager, web_contents, unsafe_resources),
         wait_for_delete_(false) {
     // Don't wait the whole 3 seconds for the browser test.
     malware_details_proceed_delay_ms_ = 100;
   }
@@ skipping 28 matching lines @@
     SafeBrowsingBlockingPageV3::OnDontProceed();
   }
 
  private:
   bool wait_for_delete_;
 };
 
 class TestSafeBrowsingBlockingPageFactory
     : public SafeBrowsingBlockingPageFactory {
  public:
-  TestSafeBrowsingBlockingPageFactory() : version_(2) { }
+  TestSafeBrowsingBlockingPageFactory() { }
   virtual ~TestSafeBrowsingBlockingPageFactory() { }
 
   virtual SafeBrowsingBlockingPage* CreateSafeBrowsingPage(
       SafeBrowsingUIManager* delegate,
       WebContents* web_contents,
       const SafeBrowsingBlockingPage::UnsafeResourceList& unsafe_resources)
           OVERRIDE {
-    if (version_ == 3) {
-      return new TestSafeBrowsingBlockingPageV3(delegate, web_contents,
-                                                unsafe_resources);
-    }
-    return new TestSafeBrowsingBlockingPageV2(delegate, web_contents,
+    return new TestSafeBrowsingBlockingPageV3(delegate, web_contents,
                                               unsafe_resources);
   }
-
-  void SetTestVersion(int version) {
-    version_ = version;
-  }
-
- private:
-  int version_;
 };
 
 }  // namespace
 
 // Tests the safe browsing blocking page in a browser.
 class SafeBrowsingBlockingPageBrowserTest
     : public InProcessBrowserTest,
       public testing::WithParamInterface<int> {
  public:
   enum Visibility {
     VISIBILITY_ERROR = -1,
     HIDDEN = 0,
     VISIBLE = 1
   };
 
   SafeBrowsingBlockingPageBrowserTest() {
   }
 
   virtual void SetUp() OVERRIDE {
     SafeBrowsingService::RegisterFactory(&factory_);
     SafeBrowsingBlockingPage::RegisterFactory(&blocking_page_factory_);
-    blocking_page_factory_.SetTestVersion(GetParam());
     MalwareDetails::RegisterFactory(&details_factory_);
     InProcessBrowserTest::SetUp();
   }
 
   virtual void TearDown() OVERRIDE {
     InProcessBrowserTest::TearDown();
     SafeBrowsingBlockingPage::RegisterFactory(NULL);
     SafeBrowsingService::RegisterFactory(NULL);
     MalwareDetails::RegisterFactory(NULL);
   }
@@ skipping 69 matching lines @@
     ASSERT_TRUE(interstitial_page);
     interstitial_page->Proceed();
   }
 
   void AssertNoInterstitial(bool wait_for_delete) {
     WebContents* contents =
         browser()->tab_strip_model()->GetActiveWebContents();
 
     if (contents->ShowingInterstitialPage() && wait_for_delete) {
       // We'll get notified when the interstitial is deleted.
-      if (GetParam() == 3) {
-        TestSafeBrowsingBlockingPageV3* page =
-            static_cast<TestSafeBrowsingBlockingPageV3*>(
-                contents->GetInterstitialPage()->GetDelegateForTesting());
-        page->WaitForDelete();
-      } else {
-        TestSafeBrowsingBlockingPageV2* page =
-            static_cast<TestSafeBrowsingBlockingPageV2*>(
-                contents->GetInterstitialPage()->GetDelegateForTesting());
-        page->WaitForDelete();
-      }
+      TestSafeBrowsingBlockingPageV3* page =
+          static_cast<TestSafeBrowsingBlockingPageV3*>(
+              contents->GetInterstitialPage()->GetDelegateForTesting());
+      page->WaitForDelete();
     }
 
     // Can't use InterstitialPage::GetInterstitialPage() because that
     // gets updated after the TestSafeBrowsingBlockingPage destructor
     ASSERT_FALSE(contents->ShowingInterstitialPage());
   }
 
   bool YesInterstitial() {
     WebContents* contents =
         browser()->tab_strip_model()->GetActiveWebContents();
@@ skipping 137 matching lines @@
  protected:
   TestMalwareDetailsFactory details_factory_;
 
  private:
   TestSafeBrowsingServiceFactory factory_;
   TestSafeBrowsingBlockingPageFactory blocking_page_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(SafeBrowsingBlockingPageBrowserTest);
 };
 
-INSTANTIATE_TEST_CASE_P(SafeBrowsingInterstitialVersions,
-                        SafeBrowsingBlockingPageBrowserTest,
-                        testing::Values(2, 3));
-
 // TODO(linux_aura) http://crbug.com/163931
 // TODO(win_aura) http://crbug.com/154081
 #if defined(USE_AURA) && !defined(OS_CHROMEOS)
 #define MAYBE_MalwareRedirectInIFrameCanceled DISABLED_MalwareRedirectInIFrameCanceled
 #else
 #define MAYBE_MalwareRedirectInIFrameCanceled MalwareRedirectInIFrameCanceled
 #endif
-IN_PROC_BROWSER_TEST_P(SafeBrowsingBlockingPageBrowserTest,
+IN_PROC_BROWSER_TEST_F(SafeBrowsingBlockingPageBrowserTest,
                        MAYBE_MalwareRedirectInIFrameCanceled) {
   // 1. Test the case that redirect is a subresource.
   MalwareRedirectCancelAndProceed("openWinIFrame");
   // If the redirect was from subresource but canceled, "proceed" will continue
   // with the rest of resources.
   AssertNoInterstitial(true);
 }
 
-IN_PROC_BROWSER_TEST_P(SafeBrowsingBlockingPageBrowserTest,
+IN_PROC_BROWSER_TEST_F(SafeBrowsingBlockingPageBrowserTest,
                        MalwareRedirectCanceled) {
   // 2. Test the case that redirect is the only resource.
   MalwareRedirectCancelAndProceed("openWin");
   // Clicking proceed won't do anything if the main request is cancelled
   // already.  See crbug.com/76460.
   EXPECT_TRUE(YesInterstitial());
 }
 
-IN_PROC_BROWSER_TEST_P(SafeBrowsingBlockingPageBrowserTest,
+IN_PROC_BROWSER_TEST_F(SafeBrowsingBlockingPageBrowserTest,
                        MalwareDontProceed) {
 #if defined(OS_WIN) && defined(USE_ASH)
   // Disable this test in Metro+Ash for now (http://crbug.com/262796).
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests))
     return;
 #endif
 
   SetupWarningAndNavigate(SB_THREAT_TYPE_URL_MALWARE);
 
-  if (GetParam() == 2) {
-    EXPECT_EQ(VISIBLE, GetVisibility("malware-icon"));
-    EXPECT_EQ(HIDDEN, GetVisibility("subresource-icon"));
-    EXPECT_EQ(HIDDEN, GetVisibility("phishing-icon"));
-    EXPECT_EQ(VISIBLE, GetVisibility("check-report"));
-    EXPECT_EQ(HIDDEN, GetVisibility("show-diagnostic-link"));
-    EXPECT_EQ(HIDDEN, GetVisibility("report-error-link"));
-    EXPECT_EQ(HIDDEN, GetVisibility("proceed"));
-    EXPECT_TRUE(Click("see-more-link"));
-    EXPECT_EQ(VISIBLE, GetVisibility("show-diagnostic-link"));
-    EXPECT_EQ(HIDDEN, GetVisibility("report-error-link"));
-    EXPECT_EQ(VISIBLE, GetVisibility("proceed"));
-    EXPECT_TRUE(ClickAndWaitForDetach("back"));
-  } else {
-    EXPECT_EQ(VISIBLE, GetVisibility("primary-button"));
-    EXPECT_EQ(HIDDEN, GetVisibility("details"));
-    EXPECT_EQ(HIDDEN, GetVisibility("proceed-link"));
-    EXPECT_EQ(HIDDEN, GetVisibility("error-code"));
-    EXPECT_TRUE(Click("details-button"));
-    EXPECT_EQ(VISIBLE, GetVisibility("details"));
-    EXPECT_EQ(VISIBLE, GetVisibility("proceed-link"));
-    EXPECT_EQ(HIDDEN, GetVisibility("error-code"));
-    EXPECT_TRUE(ClickAndWaitForDetach("primary-button"));
-  }
+  EXPECT_EQ(VISIBLE, GetVisibility("primary-button"));
+  EXPECT_EQ(HIDDEN, GetVisibility("details"));
+  EXPECT_EQ(HIDDEN, GetVisibility("proceed-link"));
+  EXPECT_EQ(HIDDEN, GetVisibility("error-code"));
+  EXPECT_TRUE(Click("details-button"));
+  EXPECT_EQ(VISIBLE, GetVisibility("details"));
+  EXPECT_EQ(VISIBLE, GetVisibility("proceed-link"));
+  EXPECT_EQ(HIDDEN, GetVisibility("error-code"));
+  EXPECT_TRUE(ClickAndWaitForDetach("primary-button"));
 
   AssertNoInterstitial(false);   // Assert the interstitial is gone
   EXPECT_EQ(GURL(url::kAboutBlankURL),  // Back to "about:blank"
             browser()->tab_strip_model()->GetActiveWebContents()->GetURL());
 }
 
-IN_PROC_BROWSER_TEST_P(SafeBrowsingBlockingPageBrowserTest, MalwareProceed) {
+IN_PROC_BROWSER_TEST_F(SafeBrowsingBlockingPageBrowserTest, MalwareProceed) {
   GURL url = SetupWarningAndNavigate(SB_THREAT_TYPE_URL_MALWARE);
 
-  if (GetParam() == 2)
-    EXPECT_TRUE(ClickAndWaitForDetach("proceed"));
-  else
-    EXPECT_TRUE(ClickAndWaitForDetach("proceed-link"));
+  EXPECT_TRUE(ClickAndWaitForDetach("proceed-link"));
   AssertNoInterstitial(true);  // Assert the interstitial is gone.
   EXPECT_EQ(url,
             browser()->tab_strip_model()->GetActiveWebContents()->GetURL());
 }
 
-IN_PROC_BROWSER_TEST_P(SafeBrowsingBlockingPageBrowserTest,
-                       MalwareLearnMoreV2) {
-  if (GetParam() == 3) return;  // Don't have this link in V3.
-  SetupWarningAndNavigate(SB_THREAT_TYPE_URL_MALWARE);
-
-  EXPECT_TRUE(ClickAndWaitForDetach("learn-more-link"));
-  AssertNoInterstitial(false);  // Assert the interstitial is gone
-
-  // We are in the help page.
-  EXPECT_EQ(
-      "/transparencyreport/safebrowsing/",
-       browser()->tab_strip_model()->GetActiveWebContents()->GetURL().path());
-}
-
-IN_PROC_BROWSER_TEST_P(SafeBrowsingBlockingPageBrowserTest,
+IN_PROC_BROWSER_TEST_F(SafeBrowsingBlockingPageBrowserTest,
                        MalwareIframeDontProceed) {
 #if defined(OS_WIN) && defined(USE_ASH)
   // Disable this test in Metro+Ash for now (http://crbug.com/262796).
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests))
     return;
 #endif
 
   SetupMalwareIframeWarningAndNavigate();
 
-  if (GetParam() == 2) {
-    EXPECT_EQ(HIDDEN, GetVisibility("malware-icon"));
-    EXPECT_EQ(VISIBLE, GetVisibility("subresource-icon"));
-    EXPECT_EQ(HIDDEN, GetVisibility("phishing-icon"));
-    EXPECT_EQ(VISIBLE, GetVisibility("check-report"));
-    EXPECT_EQ(HIDDEN, GetVisibility("show-diagnostic-link"));
-    EXPECT_EQ(HIDDEN, GetVisibility("report-error-link"));
-    EXPECT_EQ(HIDDEN, GetVisibility("proceed"));
-    EXPECT_TRUE(Click("see-more-link"));
-    EXPECT_EQ(VISIBLE, GetVisibility("show-diagnostic-link"));
-    EXPECT_EQ(HIDDEN, GetVisibility("report-error-link"));
-    EXPECT_EQ(VISIBLE, GetVisibility("proceed"));
-    EXPECT_TRUE(ClickAndWaitForDetach("back"));
-  } else {
-    EXPECT_EQ(VISIBLE, GetVisibility("primary-button"));
-    EXPECT_EQ(HIDDEN, GetVisibility("details"));
-    EXPECT_EQ(HIDDEN, GetVisibility("proceed-link"));
-    EXPECT_EQ(HIDDEN, GetVisibility("error-code"));
-    EXPECT_TRUE(Click("details-button"));
-    EXPECT_EQ(VISIBLE, GetVisibility("details"));
-    EXPECT_EQ(VISIBLE, GetVisibility("proceed-link"));
-    EXPECT_EQ(HIDDEN, GetVisibility("error-code"));
-    EXPECT_TRUE(ClickAndWaitForDetach("primary-button"));
-  }
+  EXPECT_EQ(VISIBLE, GetVisibility("primary-button"));
+  EXPECT_EQ(HIDDEN, GetVisibility("details"));
+  EXPECT_EQ(HIDDEN, GetVisibility("proceed-link"));
+  EXPECT_EQ(HIDDEN, GetVisibility("error-code"));
+  EXPECT_TRUE(Click("details-button"));
+  EXPECT_EQ(VISIBLE, GetVisibility("details"));
+  EXPECT_EQ(VISIBLE, GetVisibility("proceed-link"));
+  EXPECT_EQ(HIDDEN, GetVisibility("error-code"));
+  EXPECT_TRUE(ClickAndWaitForDetach("primary-button"));
 
   AssertNoInterstitial(false);  // Assert the interstitial is gone
 
   EXPECT_EQ(GURL(url::kAboutBlankURL),  // Back to "about:blank"
             browser()->tab_strip_model()->GetActiveWebContents()->GetURL());
 }
 
-IN_PROC_BROWSER_TEST_P(SafeBrowsingBlockingPageBrowserTest,
+IN_PROC_BROWSER_TEST_F(SafeBrowsingBlockingPageBrowserTest,
     MalwareIframeProceed) {
   GURL url = SetupMalwareIframeWarningAndNavigate();
 
-  if (GetParam() == 2)
-    EXPECT_TRUE(ClickAndWaitForDetach("proceed"));
-  else
-    EXPECT_TRUE(ClickAndWaitForDetach("proceed-link"));
+  EXPECT_TRUE(ClickAndWaitForDetach("proceed-link"));
   AssertNoInterstitial(true);  // Assert the interstitial is gone
 
   EXPECT_EQ(url,
             browser()->tab_strip_model()->GetActiveWebContents()->GetURL());
 }
 
-// http://crbug.com/273302
-#if defined(OS_WIN)
-// Temporarily re-enabled to get some logs.
-#define MAYBE_MalwareIframeReportDetails MalwareIframeReportDetails
-#else
-#define MAYBE_MalwareIframeReportDetails MalwareIframeReportDetails
-#endif
-IN_PROC_BROWSER_TEST_P(SafeBrowsingBlockingPageBrowserTest,
-                       MAYBE_MalwareIframeReportDetails) {
-  // TODO(felt): Enable for V3 when the checkbox is added.
-  if (GetParam() == 3) return;
-
+// TODO(felt): Needs to be re-enabled: http://crbug.com/273302
+IN_PROC_BROWSER_TEST_F(SafeBrowsingBlockingPageBrowserTest,
+                       DISABLED_MalwareIframeReportDetails) {
   scoped_refptr<content::MessageLoopRunner> malware_report_sent_runner(
       new content::MessageLoopRunner);
   SetReportSentCallback(malware_report_sent_runner->QuitClosure());
 
   GURL url = SetupMalwareIframeWarningAndNavigate();
 
   LOG(INFO) << "1";
 
   // If the DOM details from renderer did not already return, wait for them.
   details_factory_.get_details()->WaitForDOM();
@@ skipping 20 matching lines @@
   safe_browsing::ClientMalwareReportRequest report;
   ASSERT_TRUE(report.ParseFromString(serialized));
   // Verify the report is complete.
   EXPECT_TRUE(report.complete());
   LOG(INFO) << "8";
 }
 
 // Verifies that the "proceed anyway" link isn't available when it is disabled
 // by the corresponding policy. Also verifies that sending the "proceed"
 // command anyway doesn't advance to the malware site.
-IN_PROC_BROWSER_TEST_P(SafeBrowsingBlockingPageBrowserTest, ProceedDisabled) {
+IN_PROC_BROWSER_TEST_F(SafeBrowsingBlockingPageBrowserTest, ProceedDisabled) {
 #if defined(OS_WIN) && defined(USE_ASH)
   // Disable this test in Metro+Ash for now (http://crbug.com/262796).
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests))
     return;
 #endif
-  if (GetParam() == 3) return;
 
   // Simulate a policy disabling the "proceed anyway" link.
   browser()->profile()->GetPrefs()->SetBoolean(
       prefs::kSafeBrowsingProceedAnywayDisabled, true);
 
   SetupWarningAndNavigate(SB_THREAT_TYPE_URL_MALWARE);
 
-  if (GetParam() == 2) {
-    EXPECT_EQ(VISIBLE, GetVisibility("check-report"));
-    EXPECT_EQ(HIDDEN, GetVisibility("show-diagnostic-link"));
-    EXPECT_EQ(HIDDEN, GetVisibility("proceed"));
-    EXPECT_EQ(HIDDEN, GetVisibility("proceed-span"));
-    EXPECT_TRUE(Click("see-more-link"));
-    EXPECT_EQ(VISIBLE, GetVisibility("show-diagnostic-link"));
-    EXPECT_EQ(HIDDEN, GetVisibility("proceed"));
-    EXPECT_EQ(HIDDEN, GetVisibility("proceed-span"));
-    EXPECT_TRUE(ClickAndWaitForDetach("proceed"));
-  } else {
-    EXPECT_EQ(VISIBLE, GetVisibility("primary-button"));
-    EXPECT_EQ(HIDDEN, GetVisibility("details"));
-    EXPECT_EQ(HIDDEN, GetVisibility("proceed-link"));
-    EXPECT_EQ(HIDDEN, GetVisibility("final-paragraph"));
-    EXPECT_TRUE(Click("details-button"));
-    EXPECT_EQ(HIDDEN, GetVisibility("proceed-link"));
-    EXPECT_EQ(HIDDEN, GetVisibility("final-paragraph"));
-    SendCommand("proceed");
-  }
+  EXPECT_EQ(VISIBLE, GetVisibility("primary-button"));
+  EXPECT_EQ(HIDDEN, GetVisibility("details"));
+  EXPECT_EQ(HIDDEN, GetVisibility("proceed-link"));
+  EXPECT_EQ(HIDDEN, GetVisibility("final-paragraph"));
+  EXPECT_TRUE(Click("details-button"));
+  EXPECT_EQ(HIDDEN, GetVisibility("proceed-link"));
+  EXPECT_EQ(HIDDEN, GetVisibility("final-paragraph"));
+  SendCommand("proceed");
 
   // The "proceed" command should go back instead, if proceeding is disabled.
   AssertNoInterstitial(true);
   EXPECT_EQ(GURL(url::kAboutBlankURL),  // Back to "about:blank"
             browser()->tab_strip_model()->GetActiveWebContents()->GetURL());
 }
 
+// TODO(felt): Needs to be re-enabled: http://crbug.com/273302
 // Verifies that the reporting checkbox is hidden on non-HTTP pages.
 // TODO(mattm): Should also verify that no report is sent, but there isn't a
 // good way to do that in the current design.
-IN_PROC_BROWSER_TEST_P(SafeBrowsingBlockingPageBrowserTest, ReportingDisabled) {
+IN_PROC_BROWSER_TEST_F(SafeBrowsingBlockingPageBrowserTest,
+                       DISABLED_ReportingDisabled) {
 #if defined(OS_WIN) && defined(USE_ASH)
   // Disable this test in Metro+Ash for now (http://crbug.com/262796).
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests))
     return;
 #endif
-  // TODO(felt): Enable for V3 when the checkbox is added.
-  if (GetParam() == 3) return;
 
   browser()->profile()->GetPrefs()->SetBoolean(
       prefs::kSafeBrowsingExtendedReportingEnabled, true);
 
   net::SpawnedTestServer https_server(
       net::SpawnedTestServer::TYPE_HTTPS, net::SpawnedTestServer::kLocalhost,
       base::FilePath(FILE_PATH_LITERAL("chrome/test/data")));
   ASSERT_TRUE(https_server.Start());
   GURL url = https_server.GetURL(kEmptyPage);
   SetURLThreatType(url, SB_THREAT_TYPE_URL_MALWARE);
   ui_test_utils::NavigateToURL(browser(), url);
   ASSERT_TRUE(WaitForReady());
 
   EXPECT_EQ(HIDDEN, GetVisibility("check-report"));
   EXPECT_EQ(HIDDEN, GetVisibility("show-diagnostic-link"));
   EXPECT_EQ(HIDDEN, GetVisibility("proceed"));
   EXPECT_TRUE(Click("see-more-link"));
   EXPECT_EQ(VISIBLE, GetVisibility("show-diagnostic-link"));
   EXPECT_EQ(VISIBLE, GetVisibility("proceed"));
 
   EXPECT_TRUE(ClickAndWaitForDetach("back"));
   AssertNoInterstitial(false);   // Assert the interstitial is gone
   EXPECT_EQ(GURL(url::kAboutBlankURL),  // Back to "about:blank"
             browser()->tab_strip_model()->GetActiveWebContents()->GetURL());
 }
 
-IN_PROC_BROWSER_TEST_P(SafeBrowsingBlockingPageBrowserTest,
+IN_PROC_BROWSER_TEST_F(SafeBrowsingBlockingPageBrowserTest,
     PhishingDontProceed) {
 #if defined(OS_WIN) && defined(USE_ASH)
   // Disable this test in Metro+Ash for now (http://crbug.com/262796).
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests))
     return;
 #endif
 
   SetupWarningAndNavigate(SB_THREAT_TYPE_URL_PHISHING);
 
-  if (GetParam() == 2) {
-    EXPECT_EQ(HIDDEN, GetVisibility("malware-icon"));
-    EXPECT_EQ(HIDDEN, GetVisibility("subresource-icon"));
-    EXPECT_EQ(VISIBLE, GetVisibility("phishing-icon"));
-    EXPECT_EQ(HIDDEN, GetVisibility("check-report"));
-    EXPECT_EQ(HIDDEN, GetVisibility("show-diagnostic-link"));
-    EXPECT_EQ(HIDDEN, GetVisibility("report-error-link"));
-    EXPECT_EQ(HIDDEN, GetVisibility("proceed"));
-    EXPECT_TRUE(Click("see-more-link"));
-    EXPECT_EQ(HIDDEN, GetVisibility("show-diagnostic-link"));
-    EXPECT_EQ(VISIBLE, GetVisibility("report-error-link"));
-    EXPECT_EQ(VISIBLE, GetVisibility("proceed"));
-    EXPECT_TRUE(ClickAndWaitForDetach("back"));
-  } else {
-    EXPECT_EQ(VISIBLE, GetVisibility("primary-button"));
-    EXPECT_EQ(HIDDEN, GetVisibility("details"));
-    EXPECT_EQ(HIDDEN, GetVisibility("proceed-link"));
-    EXPECT_EQ(HIDDEN, GetVisibility("error-code"));
-    EXPECT_TRUE(Click("details-button"));
-    EXPECT_EQ(VISIBLE, GetVisibility("details"));
-    EXPECT_EQ(VISIBLE, GetVisibility("proceed-link"));
-    EXPECT_EQ(HIDDEN, GetVisibility("error-code"));
-    EXPECT_TRUE(ClickAndWaitForDetach("primary-button"));
-  }
+  EXPECT_EQ(VISIBLE, GetVisibility("primary-button"));
+  EXPECT_EQ(HIDDEN, GetVisibility("details"));
+  EXPECT_EQ(HIDDEN, GetVisibility("proceed-link"));
+  EXPECT_EQ(HIDDEN, GetVisibility("error-code"));
+  EXPECT_TRUE(Click("details-button"));
+  EXPECT_EQ(VISIBLE, GetVisibility("details"));
+  EXPECT_EQ(VISIBLE, GetVisibility("proceed-link"));
+  EXPECT_EQ(HIDDEN, GetVisibility("error-code"));
+  EXPECT_TRUE(ClickAndWaitForDetach("primary-button"));
 
   AssertNoInterstitial(false);  // Assert the interstitial is gone
   EXPECT_EQ(GURL(url::kAboutBlankURL),  // We are back to "about:blank".
             browser()->tab_strip_model()->GetActiveWebContents()->GetURL());
 }
 
 // http://crbug.com/247763
 #if defined(OS_WIN)
 // Temporarily re-enabled to get some logs.
 #define MAYBE_PhishingProceed PhishingProceed
 #else
 #define MAYBE_PhishingProceed PhishingProceed
 #endif
-IN_PROC_BROWSER_TEST_P(SafeBrowsingBlockingPageBrowserTest,
+IN_PROC_BROWSER_TEST_F(SafeBrowsingBlockingPageBrowserTest,
     MAYBE_PhishingProceed) {
   GURL url = SetupWarningAndNavigate(SB_THREAT_TYPE_URL_PHISHING);
   LOG(INFO) << "1";
 
-  if (GetParam() == 2)
-    EXPECT_TRUE(ClickAndWaitForDetach("proceed"));
-  else
-    EXPECT_TRUE(ClickAndWaitForDetach("proceed-link"));
+  EXPECT_TRUE(ClickAndWaitForDetach("proceed-link"));
   LOG(INFO) << "2";
   AssertNoInterstitial(true);  // Assert the interstitial is gone
   LOG(INFO) << "3";
   EXPECT_EQ(url,
             browser()->tab_strip_model()->GetActiveWebContents()->GetURL());
   LOG(INFO) << "4";
 }
 
-IN_PROC_BROWSER_TEST_P(SafeBrowsingBlockingPageBrowserTest,
-    PhishingReportErrorV2) {
-  if (GetParam() == 3) return;  // Not supported in V3.
-  SetupWarningAndNavigate(SB_THREAT_TYPE_URL_PHISHING);
-
-  EXPECT_TRUE(ClickAndWaitForDetach("report-error-link"));
-  AssertNoInterstitial(false);  // Assert the interstitial is gone
-
-  // We are in the error reporting page.
-  EXPECT_EQ(
-      "/safebrowsing/report_error/",
-      browser()->tab_strip_model()->GetActiveWebContents()->GetURL().path());
-}
-
 // See crbug.com/248447
 #if defined(OS_WIN)
 // Temporarily re-enabled to get some logs.
 #define MAYBE_PhishingLearnMore PhishingLearnMore
 #else
 #define MAYBE_PhishingLearnMore PhishingLearnMore
 #endif
 
-IN_PROC_BROWSER_TEST_P(SafeBrowsingBlockingPageBrowserTest,
+IN_PROC_BROWSER_TEST_F(SafeBrowsingBlockingPageBrowserTest,
     MAYBE_PhishingLearnMore) {
   SetupWarningAndNavigate(SB_THREAT_TYPE_URL_PHISHING);
   LOG(INFO) << "1";
 
-  if (GetParam() == 2)
-    EXPECT_TRUE(ClickAndWaitForDetach("learn-more-link"));
-  else
-    EXPECT_TRUE(ClickAndWaitForDetach("help-link"));
+  EXPECT_TRUE(ClickAndWaitForDetach("help-link"));
   LOG(INFO) << "2";
   AssertNoInterstitial(false);  // Assert the interstitial is gone
 
   LOG(INFO) << "3";
   // We are in the help page.
   EXPECT_EQ(
       "/transparencyreport/safebrowsing/",
        browser()->tab_strip_model()->GetActiveWebContents()->GetURL().path());
   LOG(INFO) << "4";
 }