Fix DidChangeVisibleSecurityStateObserver test

This test had the wrong expectations in cases where
kPassiveMixedContentWarning was enabled and
kMarkHttpAsParameterDangerWarning  was disabled. This fixes that and
re-enables the test.

Bug: 1052731
Change-Id: Ibfe5ee7c10230eb2fb62c76d14e4cfb31e505ae9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2078909Reviewed-by: Christopher Thompson <cthomp@chromium.org>
Commit-Queue: Carlos IL <carlosil@chromium.org>
Cr-Commit-Position: refs/heads/master@{#745666}

chrome/browser/ssl/security_state_tab_helper_browsertest.cc

@@ -1632,12 +1632,6 @@ class DidChangeVisibleSecurityStateTestWithAutoupgradesDisabled
 IN_PROC_BROWSER_TEST_F(
     DidChangeVisibleSecurityStateTestWithAutoupgradesDisabled,
     DidChangeVisibleSecurityStateObserver) {
-  // TODO(crbug.com/1052731, carlosil): This test is failing on some bots with
-  // the passive mixed content warning flag active, disabling it for now.
-  if (base::FeatureList::IsEnabled(
-          security_state::features::kPassiveMixedContentWarning)) {
-    return;
-  }
   ASSERT_TRUE(embedded_test_server()->Start());
   ASSERT_TRUE(https_server_.Start());
 
@@ -1676,7 +1670,8 @@ IN_PROC_BROWSER_TEST_F(
 
   blink::SecurityStyle expected_mixed_content_security_style =
       base::FeatureList::IsEnabled(
-          security_state::features::kPassiveMixedContentWarning)
+          security_state::features::kPassiveMixedContentWarning) &&
+              security_state::ShouldShowDangerTriangleForWarningLevel()
           ? blink::SecurityStyle::kInsecure
           : blink::SecurityStyle::kNeutral;
   EXPECT_EQ(expected_mixed_content_security_style,