Map DANGEROUS security state to kInsecureBroken

Replaces kInsecure with kInsecureBroken so that styling for
non-secure connections can later be downgraded from kNeutral
to kInsecure.

This is a follow-up to crrev.com/c/1874787 (protocol change)
and crrev.com/c/1880092 (frontend change).

Bug: 1008218
Change-Id: Iacfb79b94c1c7622749e95cd204d598b6e3c81b3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1879498Reviewed-by: Emily Stark <estark@chromium.org>
Reviewed-by: Yang Guo <yangguo@chromium.org>
Reviewed-by: Daniel Rubery <drubery@chromium.org>
Commit-Queue: Livvie Lin <livvielin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#709498}

chrome/browser/devtools/protocol/security_handler.cc

@@ -47,7 +47,7 @@ std::string SecurityLevelToProtocolSecurityState(
     case security_state::SECURE:
       return protocol::Security::SecurityStateEnum::Secure;
     case security_state::DANGEROUS:
-      return protocol::Security::SecurityStateEnum::Insecure;
+      return protocol::Security::SecurityStateEnum::InsecureBroken;
     case security_state::SECURITY_LEVEL_COUNT:
       NOTREACHED();
       return protocol::Security::SecurityStateEnum::Neutral;

chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc

@@ -1654,7 +1654,8 @@ IN_PROC_BROWSER_TEST_P(SafeBrowsingBlockingPageBrowserTest,
   // The security indicator should be downgraded while the interstitial shows.
   SetupThreatIframeWarningAndNavigate();
   ExpectSecurityIndicatorDowngrade(error_tab, 0u);
-  EXPECT_EQ(blink::SecurityStyle::kInsecure, observer.latest_security_style());
+  EXPECT_EQ(blink::SecurityStyle::kInsecureBroken,
+            observer.latest_security_style());
   // Security style summary for Developer Tools should contain a warning.
   EXPECT_EQ(l10n_util::GetStringUTF8(IDS_SAFEBROWSING_WARNING),
             observer.latest_security_style_explanations().summary);

chrome/browser/ssl/security_state_tab_helper_browsertest.cc

@@ -254,7 +254,8 @@ void CheckBrokenSecurityStyle(const SecurityStyleTestObserver& observer,
                               int error,
                               Browser* browser,
                               net::X509Certificate* expected_cert) {
-  EXPECT_EQ(blink::SecurityStyle::kInsecure, observer.latest_security_style());
+  EXPECT_EQ(blink::SecurityStyle::kInsecureBroken,
+            observer.latest_security_style());
 
   const content::SecurityStyleExplanations& expired_explanation =
       observer.latest_explanations();
@@ -1695,7 +1696,8 @@ IN_PROC_BROWSER_TEST_F(SecurityStateTabHelperTestWithHttpDangerous,
   ui_test_utils::NavigateToURL(browser(), http_url);
 
   EXPECT_EQ(security_state::DANGEROUS, helper->GetSecurityLevel());
-  EXPECT_EQ(blink::SecurityStyle::kInsecure, observer.latest_security_style());
+  EXPECT_EQ(blink::SecurityStyle::kInsecureBroken,
+            observer.latest_security_style());
   const content::SecurityStyleExplanations& http_explanation =
       observer.latest_explanations();
   EXPECT_EQ(l10n_util::GetStringUTF8(IDS_HTTP_NONSECURE_SUMMARY),

components/security_state/content/content_utils.cc

@@ -49,7 +49,7 @@ blink::SecurityStyle SecurityLevelToSecurityStyle(
     case security_state::SECURE:
       return blink::SecurityStyle::kSecure;
     case security_state::DANGEROUS:
-      return blink::SecurityStyle::kInsecure;
+      return blink::SecurityStyle::kInsecureBroken;
     case security_state::SECURITY_LEVEL_COUNT:
       NOTREACHED();
       return blink::SecurityStyle::kNeutral;

components/security_state/content/content_utils_unittest.cc

@@ -610,7 +610,7 @@ TEST(SecurityStateContentUtilsTest, HTTPDangerous) {
       security_state::DANGEROUS, visible_security_state, &explanations);
   // Verify that the security style was downgraded and an explanation shown
   // because a form was edited.
-  EXPECT_EQ(blink::SecurityStyle::kInsecure, security_style);
+  EXPECT_EQ(blink::SecurityStyle::kInsecureBroken, security_style);
   EXPECT_EQ(1u, explanations.insecure_explanations.size());
 }