Commit 2a397b40 authored by Chris Sharp's avatar Chris Sharp Committed by Commit Bot

Revert "Add HTTPDangerWarning experiment to field trial testing config"

This reverts commit 702cbe72.

Reason for revert: The modified tests broke on linux-chromeos-google-rel

Original change's description:
> Add HTTPDangerWarning experiment to field trial testing config
> 
> Bug: 1027626
> Change-Id: I70ddfb8cb18b7e045e8c6f30ce7d398d0c2f1c1b
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1929862
> Reviewed-by: Brian White <bcwhite@chromium.org>
> Reviewed-by: Carlos IL <carlosil@chromium.org>
> Reviewed-by: Steven Holte <holte@chromium.org>
> Commit-Queue: Livvie Lin <livvielin@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#719730}

TBR=bcwhite@chromium.org,holte@chromium.org,carlosil@chromium.org,livvielin@chromium.org

Change-Id: I1f1812c6dcdc8d78c505e39c8a14440279ae0111
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 1027626
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1942808Reviewed-by: default avatarChris Sharp <csharp@chromium.org>
Commit-Queue: Chris Sharp <csharp@chromium.org>
Cr-Commit-Position: refs/heads/master@{#719975}
parent a2eef778
...@@ -1108,9 +1108,7 @@ IN_PROC_BROWSER_TEST_F(SecurityStateTabHelperTest, ...@@ -1108,9 +1108,7 @@ IN_PROC_BROWSER_TEST_F(SecurityStateTabHelperTest,
// Ensure that WebContentsObservers don't show an incorrect Form Not Secure // Ensure that WebContentsObservers don't show an incorrect Form Not Secure
// explanation. Regression test for https://crbug.com/691412. // explanation. Regression test for https://crbug.com/691412.
EXPECT_EQ(0u, observer.latest_explanations().neutral_explanations.size()); EXPECT_EQ(0u, observer.latest_explanations().neutral_explanations.size());
// The below expectation is based on the feature flag set in the field trial EXPECT_EQ(blink::SecurityStyle::kNeutral, observer.latest_security_style());
// testing config.
EXPECT_EQ(blink::SecurityStyle::kInsecure, observer.latest_security_style());
content::NavigationEntry* entry = contents->GetController().GetVisibleEntry(); content::NavigationEntry* entry = contents->GetController().GetVisibleEntry();
ASSERT_TRUE(entry); ASSERT_TRUE(entry);
...@@ -1232,9 +1230,7 @@ IN_PROC_BROWSER_TEST_F(SecurityStateTabHelperTest, ...@@ -1232,9 +1230,7 @@ IN_PROC_BROWSER_TEST_F(SecurityStateTabHelperTest,
// Ensure that WebContentsObservers don't show an incorrect Form Not Secure // Ensure that WebContentsObservers don't show an incorrect Form Not Secure
// explanation. Regression test for https://crbug.com/691412. // explanation. Regression test for https://crbug.com/691412.
EXPECT_EQ(0u, observer.latest_explanations().neutral_explanations.size()); EXPECT_EQ(0u, observer.latest_explanations().neutral_explanations.size());
// The below expectation is based on the feature flag set in the field trial EXPECT_EQ(blink::SecurityStyle::kNeutral, observer.latest_security_style());
// testing config.
EXPECT_EQ(blink::SecurityStyle::kInsecure, observer.latest_security_style());
content::NavigationEntry* entry = contents->GetController().GetVisibleEntry(); content::NavigationEntry* entry = contents->GetController().GetVisibleEntry();
ASSERT_TRUE(entry); ASSERT_TRUE(entry);
...@@ -1644,9 +1640,7 @@ IN_PROC_BROWSER_TEST_F( ...@@ -1644,9 +1640,7 @@ IN_PROC_BROWSER_TEST_F(
GURL mixed_content_url(https_server_.GetURL(replacement_path)); GURL mixed_content_url(https_server_.GetURL(replacement_path));
ui_test_utils::NavigateToURL(browser(), mixed_content_url); ui_test_utils::NavigateToURL(browser(), mixed_content_url);
// The below expectation is based on the feature flag set in the field trial EXPECT_EQ(blink::SecurityStyle::kNeutral, observer.latest_security_style());
// testing config.
EXPECT_EQ(blink::SecurityStyle::kInsecure, observer.latest_security_style());
const content::SecurityStyleExplanations& mixed_content_explanation = const content::SecurityStyleExplanations& mixed_content_explanation =
observer.latest_explanations(); observer.latest_explanations();
......
...@@ -2900,7 +2900,7 @@ ...@@ -2900,7 +2900,7 @@
] ]
} }
], ],
"HTTPDangerWarning": [ "HTTPReallyBadFinal": [
{ {
"platforms": [ "platforms": [
"android", "android",
...@@ -2914,7 +2914,7 @@ ...@@ -2914,7 +2914,7 @@
{ {
"name": "enabled", "name": "enabled",
"params": { "params": {
"treatment": "danger-warning" "treatment": "dangerous"
}, },
"enable_features": [ "enable_features": [
"MarkHttpAs" "MarkHttpAs"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment