Commit 1f9b9db0 authored by Matthew Jones's avatar Matthew Jones Committed by Commit Bot

Revert "Add field trial testing config for password and safety check"

This reverts commit 2346288a.

Reason for revert: Suspected cause of failures of password related tests (testSelectedStoredPasswordIndexIsSameAsInShowPasswordEntryEditingView) on android-marshmallow-x86-rel and others:

https://ci.chromium.org/p/chromium/builders/ci/android-marshmallow-x86-rel/1349

Original change's description:
> Add field trial testing config for password and safety check
> 
> Make sure that tests which were not meant for Safety Check explicitly
> disable the feature.
> 
> Bug: 1070620, 1092444
> Change-Id: I83ba782b73cff33f6b4b6f5afa0df9d9e4db2fd6
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2410866
> Auto-Submit: Ioana Pandele <ioanap@chromium.org>
> Reviewed-by: Natalie Chouinard <chouinard@chromium.org>
> Reviewed-by: Mark Pearson <mpearson@chromium.org>
> Commit-Queue: Ioana Pandele <ioanap@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#807803}

TBR=mpearson@chromium.org,ioanap@chromium.org,chouinard@chromium.org

Change-Id: Ia51936bc2889d9fc9a8423f8d3c3186358fb045d
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 1070620
Bug: 1092444
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2416930Reviewed-by: default avatarMatthew Jones <mdjones@chromium.org>
Commit-Queue: Matthew Jones <mdjones@chromium.org>
Cr-Commit-Position: refs/heads/master@{#807928}
parent 22ce9955
...@@ -143,14 +143,9 @@ public class MainSettingsFragmentTest { ...@@ -143,14 +143,9 @@ public class MainSettingsFragmentTest {
Mockito.doReturn(SEARCH_ENGINE_SHORT_NAME).when(mMockSearchEngine).getShortName(); Mockito.doReturn(SEARCH_ENGINE_SHORT_NAME).when(mMockSearchEngine).getShortName();
} }
/**
* TODO(crbug.com/1128924): Add a corresponding test case to support Safety Check being
* enabled.
*/
@Test @Test
@LargeTest @LargeTest
@Feature({"RenderTest"}) @Feature({"RenderTest"})
@DisableFeatures({ChromeFeatureList.SAFETY_CHECK_ANDROID})
public void testRenderDifferentSignedInStates() throws IOException { public void testRenderDifferentSignedInStates() throws IOException {
launchSettingsActivity(); launchSettingsActivity();
View view = mSettingsActivityTestRule.getActivity() View view = mSettingsActivityTestRule.getActivity()
...@@ -166,12 +161,9 @@ public class MainSettingsFragmentTest { ...@@ -166,12 +161,9 @@ public class MainSettingsFragmentTest {
/** /**
* Test for the "Account" section. * Test for the "Account" section.
*
* TODO(crbug.com/1128924): Add a corresponding test case to support Safety Check being enabled.
*/ */
@Test @Test
@SmallTest @SmallTest
@DisableFeatures({ChromeFeatureList.SAFETY_CHECK_ANDROID})
public void testStartup() { public void testStartup() {
launchSettingsActivity(); launchSettingsActivity();
...@@ -215,13 +207,10 @@ public class MainSettingsFragmentTest { ...@@ -215,13 +207,10 @@ public class MainSettingsFragmentTest {
/** /**
* Test for the "Account" section. * Test for the "Account" section.
*
* TODO(crbug.com/1128924): Add a corresponding test case to support Safety Check being enabled.
*/ */
@Test @Test
@SmallTest @SmallTest
@Features.EnableFeatures({ChromeFeatureList.MOBILE_IDENTITY_CONSISTENCY}) @Features.EnableFeatures({ChromeFeatureList.MOBILE_IDENTITY_CONSISTENCY})
@DisableFeatures({ChromeFeatureList.SAFETY_CHECK_ANDROID})
public void testStartupWithMobileIdentityConsistency() { public void testStartupWithMobileIdentityConsistency() {
launchSettingsActivity(); launchSettingsActivity();
......
...@@ -6283,22 +6283,6 @@ ...@@ -6283,22 +6283,6 @@
] ]
} }
], ],
"SafetyAndPasswordCheckAndroid": [
{
"platforms": [
"android"
],
"experiments": [
{
"name": "Enabled",
"enable_features": [
"PasswordCheck",
"SafetyCheckAndroid"
]
}
]
}
],
"SafetyCheckChromeCleanerChild": [ "SafetyCheckChromeCleanerChild": [
{ {
"platforms": [ "platforms": [
......
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