Expose malware/phishing/etc. distinction from SafeBrowsingUIManager

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 570 matching lines @@
 
   void ExpectSecurityIndicatorDowngrade(content::WebContents* tab,
                                         net::CertStatus cert_status) {
     ChromeSecurityStateModelClient* model_client =
         ChromeSecurityStateModelClient::FromWebContents(tab);
     ASSERT_TRUE(model_client);
     security_state::SecurityStateModel::SecurityInfo security_info;
     model_client->GetSecurityInfo(&security_info);
     EXPECT_EQ(security_state::SecurityStateModel::DANGEROUS,
               security_info.security_level);
-    EXPECT_TRUE(security_info.fails_malware_check);
+    EXPECT_NE(security_state::SecurityStateModel::MALICIOUS_CONTENT_STATUS_NONE,
+              security_info.malicious_content_status);
     // TODO(felt): Restore this check when https://crbug.com/641187 is fixed.
     // EXPECT_EQ(cert_status, model_client->GetSecurityInfo().cert_status);
   }
 
   void ExpectNoSecurityIndicatorDowngrade(content::WebContents* tab) {
     ChromeSecurityStateModelClient* model_client =
         ChromeSecurityStateModelClient::FromWebContents(tab);
     ASSERT_TRUE(model_client);
     security_state::SecurityStateModel::SecurityInfo security_info;
     model_client->GetSecurityInfo(&security_info);
     EXPECT_EQ(security_state::SecurityStateModel::NONE,
               security_info.security_level);
-    EXPECT_FALSE(security_info.fails_malware_check);
+    EXPECT_EQ(security_state::SecurityStateModel::MALICIOUS_CONTENT_STATUS_NONE,
+              security_info.malicious_content_status);
   }
 
  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) {
@@ skipping 692 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