Commit 68ffff0e authored by Dominick Ng's avatar Dominick Ng Committed by Commit Bot

Disable the installable ambient badge infobar.

BUG=782120

Change-Id: Ie1fb67157fee61768c3f34421892c7d4c54c5107
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1554211
Commit-Queue: Dominick Ng <dominickn@chromium.org>
Reviewed-by: default avatarJay Harris <harrisjay@chromium.org>
Cr-Commit-Position: refs/heads/master@{#648382}
parent c3782b96
...@@ -249,6 +249,7 @@ public abstract class ChromeFeatureList { ...@@ -249,6 +249,7 @@ public abstract class ChromeFeatureList {
public static final String IMMERSIVE_UI_MODE = "ImmersiveUiMode"; public static final String IMMERSIVE_UI_MODE = "ImmersiveUiMode";
public static final String INCOGNITO_STRINGS = "IncognitoStrings"; public static final String INCOGNITO_STRINGS = "IncognitoStrings";
public static final String INLINE_UPDATE_FLOW = "InlineUpdateFlow"; public static final String INLINE_UPDATE_FLOW = "InlineUpdateFlow";
public static final String INSTALLABLE_AMBIENT_BADGE_INFOBAR = "InstallableAmbientBadgeInfoBar";
public static final String INTENT_BLOCK_EXTERNAL_FORM_REDIRECT_NO_GESTURE = public static final String INTENT_BLOCK_EXTERNAL_FORM_REDIRECT_NO_GESTURE =
"IntentBlockExternalFormRedirectsNoGesture"; "IntentBlockExternalFormRedirectsNoGesture";
public static final String INTEREST_FEED_CONTENT_SUGGESTIONS = "InterestFeedContentSuggestions"; public static final String INTEREST_FEED_CONTENT_SUGGESTIONS = "InterestFeedContentSuggestions";
......
...@@ -270,14 +270,16 @@ public class AppBannerManagerTest { ...@@ -270,14 +270,16 @@ public class AppBannerManagerTest {
private void waitUntilAmbientBadgeInfoBarAppears( private void waitUntilAmbientBadgeInfoBarAppears(
ChromeActivityTestRule<? extends ChromeActivity> rule) { ChromeActivityTestRule<? extends ChromeActivity> rule) {
CriteriaHelper.pollUiThread(new Criteria() { if (ChromeFeatureList.isEnabled(ChromeFeatureList.INSTALLABLE_AMBIENT_BADGE_INFOBAR)) {
@Override CriteriaHelper.pollUiThread(new Criteria() {
public boolean isSatisfied() { @Override
List<InfoBar> infobars = rule.getInfoBars(); public boolean isSatisfied() {
if (infobars.size() != 1) return false; List<InfoBar> infobars = rule.getInfoBars();
return infobars.get(0) instanceof InstallableAmbientBadgeInfoBar; if (infobars.size() != 1) return false;
} return infobars.get(0) instanceof InstallableAmbientBadgeInfoBar;
}); }
});
}
} }
private void runFullNativeInstallPathway( private void runFullNativeInstallPathway(
...@@ -644,6 +646,7 @@ public class AppBannerManagerTest { ...@@ -644,6 +646,7 @@ public class AppBannerManagerTest {
@Test @Test
@MediumTest @MediumTest
@Feature({"AppBanners"}) @Feature({"AppBanners"})
@CommandLineFlags.Add("enable-features=" + ChromeFeatureList.INSTALLABLE_AMBIENT_BADGE_INFOBAR)
public void testBlockedAmbientBadgeDoesNotAppearAgainForMonths() throws Exception { public void testBlockedAmbientBadgeDoesNotAppearAgainForMonths() throws Exception {
// Visit a site that is a PWA. The ambient badge should show. // Visit a site that is a PWA. The ambient badge should show.
String webBannerUrl = WebappTestPage.getServiceWorkerUrl(mTestServer); String webBannerUrl = WebappTestPage.getServiceWorkerUrl(mTestServer);
......
...@@ -72,6 +72,7 @@ const base::Feature* kFeaturesExposedToJava[] = { ...@@ -72,6 +72,7 @@ const base::Feature* kFeaturesExposedToJava[] = {
&features::kDownloadsLocationChange, &features::kDownloadsLocationChange,
&features::kExperimentalAppBanners, &features::kExperimentalAppBanners,
&features::kIncognitoStrings, &features::kIncognitoStrings,
&features::kInstallableAmbientBadgeInfoBar,
&features::kOverscrollHistoryNavigation, &features::kOverscrollHistoryNavigation,
&features::kPermissionDelegation, &features::kPermissionDelegation,
&features::kPredictivePrefetchingAllowedOnAllConnectionTypes, &features::kPredictivePrefetchingAllowedOnAllConnectionTypes,
......
...@@ -357,7 +357,7 @@ const base::Feature kInSessionPasswordChange{"InSessionPasswordChange", ...@@ -357,7 +357,7 @@ const base::Feature kInSessionPasswordChange{"InSessionPasswordChange",
#if defined(OS_ANDROID) #if defined(OS_ANDROID)
// Enables or disables the installable ambient badge infobar. // Enables or disables the installable ambient badge infobar.
const base::Feature kInstallableAmbientBadgeInfoBar{ const base::Feature kInstallableAmbientBadgeInfoBar{
"InstallableAmbientBadgeInfoBar", base::FEATURE_ENABLED_BY_DEFAULT}; "InstallableAmbientBadgeInfoBar", base::FEATURE_DISABLED_BY_DEFAULT};
#endif #endif
#if !defined(OS_ANDROID) #if !defined(OS_ANDROID)
......
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