Remove HideUserDataFromIncognitoNotifications feature flag.
This feature has been enabled by default for 7 months, removing the flag
for clean up.
Bug: 629887
Change-Id: If03e91870ed108949a5d30a69a245aa0f8fd29e4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1583729
Commit-Queue: Ramin Halavati <rhalavati@chromium.org>
Reviewed-by: Mounir Lamouri <mlamouri@chromium.org>
Cr-Commit-Position: refs/heads/master@{#655153}
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeFeatureList.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeFeatureList.java
index 3f183ef..a8bfcd7 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeFeatureList.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeFeatureList.java
@@ -240,8 +240,6 @@
public static final String GENERIC_SENSOR_EXTRA_CLASSES = "GenericSensorExtraClasses";
public static final String GRANT_NOTIFICATIONS_TO_DSE = "GrantNotificationsToDSE";
public static final String HANDLE_MEDIA_INTENTS = "HandleMediaIntents";
- public static final String HIDE_USER_DATA_FROM_INCOGNITO_NOTIFICATIONS =
- "HideUserDataFromIncognitoNotifications";
public static final String HOME_PAGE_BUTTON_FORCE_ENABLED = "HomePageButtonForceEnabled";
public static final String HOMEPAGE_TILE = "HomepageTile";
public static final String HORIZONTAL_TAB_SWITCHER_ANDROID = "HorizontalTabSwitcherAndroid";
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/media/MediaCaptureNotificationService.java b/chrome/android/java/src/org/chromium/chrome/browser/media/MediaCaptureNotificationService.java
index 8ae3be11..e764c9c4 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/media/MediaCaptureNotificationService.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/media/MediaCaptureNotificationService.java
@@ -17,7 +17,6 @@
import org.chromium.base.ContextUtils;
import org.chromium.base.Log;
import org.chromium.chrome.R;
-import org.chromium.chrome.browser.ChromeFeatureList;
import org.chromium.chrome.browser.notifications.ChromeNotification;
import org.chromium.chrome.browser.notifications.ChromeNotificationBuilder;
import org.chromium.chrome.browser.notifications.NotificationBuilderFactory;
@@ -210,16 +209,12 @@
}
}
- boolean hideUserData = isIncognito
- && ChromeFeatureList.isEnabled(
- ChromeFeatureList.HIDE_USER_DATA_FROM_INCOGNITO_NOTIFICATIONS);
-
StringBuilder descriptionText =
- new StringBuilder(getNotificationContentText(mediaType, url, hideUserData))
+ new StringBuilder(getNotificationContentText(mediaType, url, isIncognito))
.append('.');
String contentText;
- if (hideUserData) {
+ if (isIncognito) {
builder.setSubText(ContextUtils.getApplicationContext().getResources().getString(
R.string.notification_incognito_tab));
// App name is automatically added to the title from Android N,
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/media/ui/MediaNotificationManager.java b/chrome/android/java/src/org/chromium/chrome/browser/media/ui/MediaNotificationManager.java
index 6202f28..3ff2cdef 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/media/ui/MediaNotificationManager.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/media/ui/MediaNotificationManager.java
@@ -40,7 +40,6 @@
import org.chromium.base.SysUtils;
import org.chromium.base.VisibleForTesting;
import org.chromium.chrome.R;
-import org.chromium.chrome.browser.ChromeFeatureList;
import org.chromium.chrome.browser.notifications.ChromeNotification;
import org.chromium.chrome.browser.notifications.ChromeNotificationBuilder;
import org.chromium.chrome.browser.notifications.ForegroundServiceUtils;
@@ -1095,15 +1094,13 @@
private void setMediaStyleLayoutForNotificationBuilder(ChromeNotificationBuilder builder) {
setMediaStyleNotificationText(builder);
- // Notifications in incognito shouldn't show an icon to avoid leaking information.
- boolean hideUserData = mMediaNotificationInfo.isPrivate
- && ChromeFeatureList.isEnabled(
- ChromeFeatureList.HIDE_USER_DATA_FROM_INCOGNITO_NOTIFICATIONS);
if (!mMediaNotificationInfo.supportsPlayPause()) {
// Non-playback (Cast) notification will not use MediaStyle, so not
// setting the large icon is fine.
builder.setLargeIcon(null);
- } else if (mMediaNotificationInfo.notificationLargeIcon != null && !hideUserData) {
+ // Notifications in incognito shouldn't show an icon to avoid leaking information.
+ } else if (mMediaNotificationInfo.notificationLargeIcon != null
+ && !mMediaNotificationInfo.isPrivate) {
builder.setLargeIcon(mMediaNotificationInfo.notificationLargeIcon);
} else if (!isRunningAtLeastN()) {
if (mDefaultNotificationLargeIcon == null
@@ -1164,10 +1161,7 @@
}
private void setMediaStyleNotificationText(ChromeNotificationBuilder builder) {
- boolean hideUserData = mMediaNotificationInfo.isPrivate
- && ChromeFeatureList.isEnabled(
- ChromeFeatureList.HIDE_USER_DATA_FROM_INCOGNITO_NOTIFICATIONS);
- if (hideUserData) {
+ if (mMediaNotificationInfo.isPrivate) {
// Notifications in incognito shouldn't show what is playing to avoid leaking
// information.
if (isRunningAtLeastN()) {
diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/media/ui/MediaNotificationManagerNotificationTest.java b/chrome/android/junit/src/org/chromium/chrome/browser/media/ui/MediaNotificationManagerNotificationTest.java
index 59a7deb2..2f6dd70 100644
--- a/chrome/android/junit/src/org/chromium/chrome/browser/media/ui/MediaNotificationManagerNotificationTest.java
+++ b/chrome/android/junit/src/org/chromium/chrome/browser/media/ui/MediaNotificationManagerNotificationTest.java
@@ -25,7 +25,6 @@
import org.chromium.base.test.BaseRobolectricTestRunner;
import org.chromium.chrome.R;
-import org.chromium.chrome.browser.ChromeFeatureList;
import org.chromium.services.media_session.MediaMetadata;
/**
@@ -50,10 +49,7 @@
ShadowNotification shadowNotification = Shadows.shadowOf(notification);
- boolean userDataIsHidden = info.isPrivate
- && ChromeFeatureList.isEnabled(
- ChromeFeatureList.HIDE_USER_DATA_FROM_INCOGNITO_NOTIFICATIONS);
- if (userDataIsHidden) {
+ if (info.isPrivate) {
assertNotEquals("title", shadowNotification.getContentTitle());
assertNotEquals("artist - album", shadowNotification.getContentText());
if (hasNApis()) {
@@ -82,10 +78,7 @@
ShadowNotification shadowNotification = Shadows.shadowOf(notification);
- boolean userDataIsHidden = info.isPrivate
- && ChromeFeatureList.isEnabled(
- ChromeFeatureList.HIDE_USER_DATA_FROM_INCOGNITO_NOTIFICATIONS);
- if (userDataIsHidden) {
+ if (info.isPrivate) {
assertNotEquals(info.metadata.getTitle(), shadowNotification.getContentTitle());
assertNotNull(shadowNotification.getContentText());
} else {
@@ -109,10 +102,7 @@
ShadowNotification shadowNotification = Shadows.shadowOf(notification);
- boolean userDataIsHidden = info.isPrivate
- && ChromeFeatureList.isEnabled(
- ChromeFeatureList.HIDE_USER_DATA_FROM_INCOGNITO_NOTIFICATIONS);
- if (userDataIsHidden) {
+ if (info.isPrivate) {
assertNotEquals(info.metadata.getTitle(), shadowNotification.getContentTitle());
assertNull(shadowNotification.getContentText());
if (hasNApis()) {
@@ -138,10 +128,7 @@
Notification notification = updateNotificationBuilderAndBuild(info);
if (hasNApis()) {
- boolean userDataIsHidden = info.isPrivate
- && ChromeFeatureList.isEnabled(
- ChromeFeatureList.HIDE_USER_DATA_FROM_INCOGNITO_NOTIFICATIONS);
- if (userDataIsHidden) {
+ if (info.isPrivate) {
assertNull(notification.getLargeIcon());
} else {
assertTrue(largeIcon.sameAs(iconToBitmap(notification.getLargeIcon())));
diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/media/ui/MediaNotificationManagerTestBase.java b/chrome/android/junit/src/org/chromium/chrome/browser/media/ui/MediaNotificationManagerTestBase.java
index 5ea143d..58c618d8 100644
--- a/chrome/android/junit/src/org/chromium/chrome/browser/media/ui/MediaNotificationManagerTestBase.java
+++ b/chrome/android/junit/src/org/chromium/chrome/browser/media/ui/MediaNotificationManagerTestBase.java
@@ -34,14 +34,11 @@
import org.chromium.base.CommandLine;
import org.chromium.base.ContextUtils;
import org.chromium.chrome.browser.AppHooks;
-import org.chromium.chrome.browser.ChromeFeatureList;
import org.chromium.chrome.browser.media.ui.MediaNotificationManager.ListenerService;
import org.chromium.chrome.browser.notifications.ForegroundServiceUtils;
import org.chromium.chrome.browser.notifications.NotificationUmaTracker;
import org.chromium.services.media_session.MediaMetadata;
-import java.util.HashMap;
-import java.util.Map;
import java.util.concurrent.TimeUnit;
/**
@@ -140,11 +137,6 @@
// Init the command line to avoid assertion failure in |SysUtils#isLowEndDevice()|.
CommandLine.init(null);
- // Init ChromeFeaturesList to avoid assertion failure in
- // MediaNotificationManagerNotificationTest.
- Map<String, Boolean> testFeatures = new HashMap<>();
- testFeatures.put(ChromeFeatureList.HIDE_USER_DATA_FROM_INCOGNITO_NOTIFICATIONS, true);
- ChromeFeatureList.setTestFeatures(testFeatures);
}
@After
diff --git a/chrome/browser/android/chrome_feature_list.cc b/chrome/browser/android/chrome_feature_list.cc
index cae8b54..1bd9a3b 100644
--- a/chrome/browser/android/chrome_feature_list.cc
+++ b/chrome/browser/android/chrome_feature_list.cc
@@ -137,7 +137,6 @@
&kEphemeralTab,
&kExploreSites,
&kHandleMediaIntents,
- &kHideUserDataFromIncognitoNotifications,
&kHomePageButtonForceEnabled,
&kHomepageTile,
&kHorizontalTabSwitcherAndroid,
@@ -395,9 +394,6 @@
const base::Feature kHandleMediaIntents{"HandleMediaIntents",
base::FEATURE_ENABLED_BY_DEFAULT};
-const base::Feature kHideUserDataFromIncognitoNotifications{
- "HideUserDataFromIncognitoNotifications", base::FEATURE_ENABLED_BY_DEFAULT};
-
const base::Feature kHomePageButtonForceEnabled{
"HomePageButtonForceEnabled", base::FEATURE_DISABLED_BY_DEFAULT};
diff --git a/chrome/browser/android/chrome_feature_list.h b/chrome/browser/android/chrome_feature_list.h
index 027f5de..2fd10cf 100644
--- a/chrome/browser/android/chrome_feature_list.h
+++ b/chrome/browser/android/chrome_feature_list.h
@@ -68,7 +68,6 @@
extern const base::Feature kExploreSites;
extern const base::Feature kForegroundNotificationManager;
extern const base::Feature kHandleMediaIntents;
-extern const base::Feature kHideUserDataFromIncognitoNotifications;
extern const base::Feature kHomePageButtonForceEnabled;
extern const base::Feature kHomepageTile;
extern const base::Feature kHorizontalTabSwitcherAndroid;
