Downgrade security state while displaying an SB interstitial

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 known-
 // threat urls.  It then uses a real browser to go to these urls, and sends
 // "goback" or "proceed" commands and verifies they work.
 
 #include <algorithm>
 
@@ skipping 553 matching lines @@
     for (auto resource : report.resources()) {
       if (actual_resource.parent_id() == resource.id()) {
         EXPECT_EQ(expected_parent, resource.url());
         break;
       }
     }
     EXPECT_EQ(expected_child_size, actual_resource.child_ids_size());
     EXPECT_EQ(expected_tag_name, actual_resource.tag_name());
   }
 
+  void ExpectSecurityIndicatorDowngrade(content::WebContents* tab) {
+    ChromeSecurityStateModelClient* model_client =
+        ChromeSecurityStateModelClient::FromWebContents(tab);
+    ASSERT_TRUE(model_client);
+    EXPECT_EQ(security_state::SecurityStateModel::SECURITY_ERROR,
+              model_client->GetSecurityInfo().security_level);
+    EXPECT_TRUE(model_client->GetSecurityInfo().fails_malware_check);
+  }
+
  protected:
   TestThreatDetailsFactory details_factory_;
 
  private:
   // Adds a safebrowsing result of the current test threat to the fake
   // safebrowsing service, navigates to that page, and returns the url.
   // The various wrappers supply different URLs.
   GURL SetupWarningAndNavigateToURL(GURL url) {
     SetURLThreatType(url, testing::get<0>(GetParam()));
     ui_test_utils::NavigateToURL(browser(), url);
@@ skipping 456 matching lines @@
   ui_test_utils::NavigateToURL(browser(), url);
   EXPECT_TRUE(WaitForReady());
   EXPECT_TRUE(ClickAndWaitForDetach("proceed-link"));
   AssertNoInterstitial(true);
 }
 
 // Test that the security indicator is downgraded after clicking through a
 // Safe Browsing interstitial.
 IN_PROC_BROWSER_TEST_P(SafeBrowsingBlockingPageBrowserTest,
                        SecurityState_HTTP) {
+  // The security indicator should be downgraded while the interstitial shows.
   SetupWarningAndNavigate();
+  WebContents* error_tab = browser()->tab_strip_model()->GetActiveWebContents();
+  ASSERT_TRUE(error_tab);
+  ExpectSecurityIndicatorDowngrade(error_tab);
+
+  // The security indicator should still be downgraded post-interstitial.
   EXPECT_TRUE(ClickAndWaitForDetach("proceed-link"));
   AssertNoInterstitial(true);
-
-  WebContents* tab = browser()->tab_strip_model()->GetActiveWebContents();
-  ASSERT_TRUE(tab);
-  ChromeSecurityStateModelClient* model_client =
-      ChromeSecurityStateModelClient::FromWebContents(tab);
-  ASSERT_TRUE(model_client);
-  EXPECT_EQ(security_state::SecurityStateModel::SECURITY_ERROR,
-            model_client->GetSecurityInfo().security_level);
-  EXPECT_TRUE(model_client->GetSecurityInfo().fails_malware_check);
+  WebContents* post_tab = browser()->tab_strip_model()->GetActiveWebContents();
+  ASSERT_TRUE(post_tab);
+  ExpectSecurityIndicatorDowngrade(post_tab);
 }
 
 // Test that the security indicator is downgraded even if the website has valid
 // HTTPS (meaning that the SB state overrides the HTTPS state).
 IN_PROC_BROWSER_TEST_P(SafeBrowsingBlockingPageBrowserTest,
                        SecurityState_ValidHTTPS) {
+  // The security indicator should be downgraded while the interstitial shows.
   SetupWarningAndNavigateToValidHTTPS();
+  WebContents* error_tab = browser()->tab_strip_model()->GetActiveWebContents();
+  ASSERT_TRUE(error_tab);
+  ExpectSecurityIndicatorDowngrade(error_tab);
+
+  // The security indicator should still be downgraded post-interstitial.
   EXPECT_TRUE(ClickAndWaitForDetach("proceed-link"));
   AssertNoInterstitial(true);
-
-  WebContents* tab = browser()->tab_strip_model()->GetActiveWebContents();
-  ASSERT_TRUE(tab);
-  ChromeSecurityStateModelClient* model_client =
-      ChromeSecurityStateModelClient::FromWebContents(tab);
-  ASSERT_TRUE(model_client);
-  EXPECT_EQ(security_state::SecurityStateModel::SECURITY_ERROR,
-            model_client->GetSecurityInfo().security_level);
-  EXPECT_TRUE(model_client->GetSecurityInfo().fails_malware_check);
+  WebContents* post_tab = browser()->tab_strip_model()->GetActiveWebContents();
+  ASSERT_TRUE(post_tab);
+  ExpectSecurityIndicatorDowngrade(post_tab);
   EXPECT_EQ(0u, model_client->GetSecurityInfo().cert_status);
 }
 
 // Test that the security indicator is still downgraded after two interstitials
 // are shown in a row (one for Safe Browsing, one for invalid HTTPS).
 IN_PROC_BROWSER_TEST_P(SafeBrowsingBlockingPageBrowserTest,
                        SecurityState_InvalidHTTPS) {
+  // The security indicator should be downgraded while the interstitial shows.
   SetupWarningAndNavigateToInvalidHTTPS();
+  WebContents* error_tab = browser()->tab_strip_model()->GetActiveWebContents();
+  ASSERT_TRUE(error_tab);
+  ExpectSecurityIndicatorDowngrade(error_tab);
+
+  // The security indicator should still be downgraded post-interstitial.
   EXPECT_TRUE(ClickAndWaitForDetach("proceed-link"));
   AssertNoInterstitial(true);
-
-  WebContents* tab = browser()->tab_strip_model()->GetActiveWebContents();
-  ASSERT_TRUE(tab);
-  ChromeSecurityStateModelClient* model_client =
-      ChromeSecurityStateModelClient::FromWebContents(tab);
-  ASSERT_TRUE(model_client);
-  EXPECT_EQ(security_state::SecurityStateModel::SECURITY_ERROR,
-            model_client->GetSecurityInfo().security_level);
-  EXPECT_TRUE(model_client->GetSecurityInfo().fails_malware_check);
+  WebContents* post_tab = browser()->tab_strip_model()->GetActiveWebContents();
+  ASSERT_TRUE(post_tab);
+  ExpectSecurityIndicatorDowngrade(post_tab);
   EXPECT_NE(0u, model_client->GetSecurityInfo().cert_status);

[felt, 2016/08/25 06:10:33]

Note: this line (which depends on having a model_client) needs to move up into
ExpectSecurityIndicatorDowngrade(), but I'm leaving it here for now while I
figure out why that check is failing in the dependent CL
(https://codereview.chromium.org/2270283002/).

 }
 
 INSTANTIATE_TEST_CASE_P(
     SafeBrowsingBlockingPageBrowserTestWithThreatTypeAndIsolationSetting,
     SafeBrowsingBlockingPageBrowserTest,
     testing::Combine(
         testing::Values(SB_THREAT_TYPE_URL_MALWARE,  // Threat types
                         SB_THREAT_TYPE_URL_PHISHING,
                         SB_THREAT_TYPE_URL_UNWANTED),
         testing::Bool()));  // If isolate all sites for testing.
@@ skipping 37 matching lines @@
 
 INSTANTIATE_TEST_CASE_P(
     SafeBrowsingBlockingPageIDNTestWithThreatType,
     SafeBrowsingBlockingPageIDNTest,
     testing::Combine(testing::Values(false, true),
                      testing::Values(SB_THREAT_TYPE_URL_MALWARE,
                                      SB_THREAT_TYPE_URL_PHISHING,
                                      SB_THREAT_TYPE_URL_UNWANTED)));
 
 }  // namespace safe_browsing