Clean up UpdateHistoryEntryPointsInIncognito flags in Android.

This CL cleans up the old UpdateHistoryEntryPointsInIncognito feature flag in Android. Bug: 1308395 Change-Id: I5500c4b38c3cca34218ac83ec579e9fee0ca8db9 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3568568 Reviewed-by: Theresa Sullivan <twellington@chromium.org> Commit-Queue: Side YILMAZ <sideyilmaz@chromium.org> Cr-Commit-Position: refs/heads/main@{#988892}
chromium · Apr 5, 2022 · c6a5a64 · c6a5a64
1 parent 1414650
commit c6a5a64
Show file tree

Hide file tree

Showing 9 changed files with 5 additions and 37 deletions.
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/gesturenav/NavigationSheetMediator.java b/chrome/android/java/src/org/chromium/chrome/browser/gesturenav/NavigationSheetMediator.java
@@ -14,7 +14,6 @@
 import android.view.View;
 
 import org.chromium.chrome.R;
-import org.chromium.chrome.browser.flags.ChromeFeatureList;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.ui.favicon.FaviconHelper;
 import org.chromium.chrome.browser.ui.favicon.FaviconUtils;
@@ -39,8 +38,6 @@
  * Mediator class for navigation sheet.
  */
 class NavigationSheetMediator {
-    private static final String INCOGNITO_HISTORY_ENTRIES_FLAG =
-            ChromeFeatureList.UPDATE_HISTORY_ENTRY_POINTS_IN_INCOGNITO;
     private final ClickListener mClickListener;
     private final FaviconHelper mFaviconHelper;
     private final RoundedIconGenerator mIconGenerator;
@@ -171,16 +168,10 @@ private String getEntryText(NavigationEntry entry) {
     }
 
     private Drawable getNTPIcon() {
-        return mProfile.isOffTheRecord()
-                        && ChromeFeatureList.isEnabled(INCOGNITO_HISTORY_ENTRIES_FLAG)
-                ? mIncognitoIcon
-                : mDefaultIcon;
+        return mProfile.isOffTheRecord() ? mIncognitoIcon : mDefaultIcon;
     }
 
     private String getNTPText() {
-        return mProfile.isOffTheRecord()
-                        && ChromeFeatureList.isEnabled(INCOGNITO_HISTORY_ENTRIES_FLAG)
-                ? mNewIncognitoTabText
-                : mNewTabText;
+        return mProfile.isOffTheRecord() ? mNewIncognitoTabText : mNewTabText;
     }
 }
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/gesturenav/TabbedSheetDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/gesturenav/TabbedSheetDelegate.java
@@ -5,7 +5,6 @@
 package org.chromium.chrome.browser.gesturenav;
 
 import org.chromium.base.Consumer;
-import org.chromium.chrome.browser.flags.ChromeFeatureList;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.components.embedder_support.util.UrlConstants;
 import org.chromium.content_public.browser.NavigationEntry;
@@ -19,8 +18,6 @@
 public class TabbedSheetDelegate implements NavigationSheet.Delegate {
     private static final int MAXIMUM_HISTORY_ITEMS = 8;
     private static final int FULL_HISTORY_ENTRY_INDEX = -1;
-    private static final String INCOGNITO_HISTORY_ENTRIES_FLAG =
-            ChromeFeatureList.UPDATE_HISTORY_ENTRY_POINTS_IN_INCOGNITO;
 
     private final Tab mTab;
     private final Consumer<Tab> mShowHistoryManager;
@@ -37,7 +34,7 @@ public NavigationHistory getHistory(boolean forward, boolean isOffTheRecord) {
         NavigationHistory history =
                 mTab.getWebContents().getNavigationController().getDirectedNavigationHistory(
                         forward, MAXIMUM_HISTORY_ITEMS);
-        if (!isOffTheRecord || !ChromeFeatureList.isEnabled(INCOGNITO_HISTORY_ENTRIES_FLAG)) {
+        if (!isOffTheRecord) {
             history.addEntry(new NavigationEntry(FULL_HISTORY_ENTRY_INDEX,
                     new GURL(UrlConstants.HISTORY_URL), GURL.emptyGURL(), GURL.emptyGURL(),
                     GURL.emptyGURL(), mFullHistoryMenu, null, 0, 0,

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/history/HistoryManager.java b/chrome/android/java/src/org/chromium/chrome/browser/history/HistoryManager.java
@@ -23,7 +23,6 @@
 import org.chromium.base.supplier.Supplier;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.browsing_data.ClearBrowsingDataTabsFragment;
-import org.chromium.chrome.browser.flags.ChromeFeatureList;
 import org.chromium.chrome.browser.preferences.ChromePreferenceKeys;
 import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
 import org.chromium.chrome.browser.search_engines.TemplateUrlServiceFactory;
@@ -230,9 +229,7 @@ public ViewGroup getView() {
     }
 
     private boolean shouldShowIncognitoPlaceholder() {
-        return mIsIncognito
-                && ChromeFeatureList.isEnabled(
-                        ChromeFeatureList.UPDATE_HISTORY_ENTRY_POINTS_IN_INCOGNITO);
+        return mIsIncognito;
     }
 
     /**

diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/gesturenav/NavigationSheetTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/gesturenav/NavigationSheetTest.java
@@ -26,7 +26,6 @@
 import org.chromium.base.test.util.UrlUtils;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.ChromeTabbedActivity;
-import org.chromium.chrome.browser.flags.ChromeFeatureList;
 import org.chromium.chrome.browser.flags.ChromeSwitches;
 import org.chromium.chrome.browser.gesturenav.NavigationSheetMediator.ItemProperties;
 import org.chromium.chrome.browser.profiles.Profile;
@@ -35,7 +34,6 @@
 import org.chromium.chrome.browser.ui.RootUiCoordinator;
 import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
 import org.chromium.chrome.test.ChromeTabbedActivityTestRule;
-import org.chromium.chrome.test.util.browser.Features.EnableFeatures;
 import org.chromium.components.browser_ui.bottomsheet.BottomSheetController;
 import org.chromium.components.embedder_support.util.UrlConstants;
 import org.chromium.content_public.browser.NavigationController;
@@ -232,7 +230,6 @@ public void testLongPressBackTriggering_Cancellation() throws ExecutionException
 
     @Test
     @MediumTest
-    @EnableFeatures({ChromeFeatureList.UPDATE_HISTORY_ENTRY_POINTS_IN_INCOGNITO})
     public void testFieldsForOffTheRecordProfile() throws ExecutionException {
         TestNavigationController controller = new TestNavigationController();
         NavigationSheetCoordinator sheet = (NavigationSheetCoordinator) showPopup(controller, true);
@@ -261,7 +258,6 @@ public void testFieldsForOffTheRecordProfile() throws ExecutionException {
 
     @Test
     @MediumTest
-    @EnableFeatures({ChromeFeatureList.UPDATE_HISTORY_ENTRY_POINTS_IN_INCOGNITO})
     public void testFieldsForRegularProfile() throws ExecutionException {
         TestNavigationController controller = new TestNavigationController();
         NavigationSheetCoordinator sheet =

diff --git a/...me/android/javatests/src/org/chromium/chrome/browser/toolbar/top/NavigationPopupTest.java b/...me/android/javatests/src/org/chromium/chrome/browser/toolbar/top/NavigationPopupTest.java
@@ -26,13 +26,11 @@
 import org.chromium.base.test.util.Feature;
 import org.chromium.base.test.util.UrlUtils;
 import org.chromium.chrome.R;
-import org.chromium.chrome.browser.flags.ChromeFeatureList;
 import org.chromium.chrome.browser.flags.ChromeSwitches;
 import org.chromium.chrome.browser.history.HistoryManagerUtils;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
 import org.chromium.chrome.test.ChromeTabbedActivityTestRule;
-import org.chromium.chrome.test.util.browser.Features;
 import org.chromium.content_public.browser.NavigationController;
 import org.chromium.content_public.browser.NavigationEntry;
 import org.chromium.content_public.browser.NavigationHistory;
@@ -147,7 +145,6 @@ public void testShowAllHistory() throws ExecutionException {
     @Test
     @SmallTest
     @Feature({"Navigation"})
-    @Features.EnableFeatures({ChromeFeatureList.UPDATE_HISTORY_ENTRY_POINTS_IN_INCOGNITO})
     public void testPopupForIncognito() throws ExecutionException {
         final TestNavigationController controller = new TestNavigationController();
         final ListPopupWindow popup = showPopup(controller, true);

diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc
@@ -294,7 +294,6 @@ const base::Feature* const kFeaturesExposedToJava[] = {
     &kShowExtendedPreloadingSetting,
     &kStartSurfaceAndroid,
     &kUmaBackgroundSessions,
-    &kUpdateHistoryEntryPointsInIncognito,
     &kUpdateNotificationScheduleServiceImmediateShowOption,
     &kVoiceSearchAudioCapturePolicy,
     &kVoiceButtonInTopToolbar,
@@ -810,9 +809,6 @@ const base::Feature kStartSurfaceAndroid{"StartSurfaceAndroid",
 const base::Feature kUmaBackgroundSessions{"UMABackgroundSessions",
                                            base::FEATURE_ENABLED_BY_DEFAULT};
 
-const base::Feature kUpdateHistoryEntryPointsInIncognito{
-    "UpdateHistoryEntryPointsInIncognito", base::FEATURE_ENABLED_BY_DEFAULT};
-
 const base::Feature kUpdateNotificationScheduleServiceImmediateShowOption{
     "UpdateNotificationScheduleServiceImmediateShowOption",
     base::FEATURE_DISABLED_BY_DEFAULT};

diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser/flags/android/chrome_feature_list.h
@@ -160,7 +160,6 @@ extern const base::Feature kTrustedWebActivityQualityEnforcementWarning;
 extern const base::Feature kShowExtendedPreloadingSetting;
 extern const base::Feature kStartSurfaceAndroid;
 extern const base::Feature kUmaBackgroundSessions;
-extern const base::Feature kUpdateHistoryEntryPointsInIncognito;
 extern const base::Feature
     kUpdateNotificationScheduleServiceImmediateShowOption;
 extern const base::Feature kUserMediaScreenCapturing;

diff --git a/...e/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/...e/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
@@ -527,8 +527,6 @@ public static boolean getFieldTrialParamByFeatureAsBoolean(
     public static final String UPCOMING_SHARING_FEATURES = "UpcomingSharingFeatures";
     public static final String UPDATE_NOTIFICATION_IMMEDIATE_SHOW_OPTION =
             "UpdateNotificationScheduleServiceImmediateShowOption";
-    public static final String UPDATE_HISTORY_ENTRY_POINTS_IN_INCOGNITO =
-            "UpdateHistoryEntryPointsInIncognito";
     public static final String USE_CHIME_ANDROID_SDK = "UseChimeAndroidSdk";
     public static final String USE_CLIENT_CONFIG_IPH = "UseClientConfigIPH";
     public static final String VOICE_SEARCH_AUDIO_CAPTURE_POLICY = "VoiceSearchAudioCapturePolicy";

diff --git a/.../ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/NavigationPopup.java b/.../ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/NavigationPopup.java
@@ -30,7 +30,6 @@
 import org.chromium.base.metrics.RecordHistogram;
 import org.chromium.base.metrics.RecordUserAction;
 import org.chromium.base.supplier.Supplier;
-import org.chromium.chrome.browser.flags.ChromeFeatureList;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.toolbar.R;
@@ -360,9 +359,7 @@ private void setViewText(NavigationEntry entry, TextView view) {
     }
 
     private boolean shouldUseIncognitoResources() {
-        return mProfile.isOffTheRecord()
-                && ChromeFeatureList.isEnabled(
-                        ChromeFeatureList.UPDATE_HISTORY_ENTRY_POINTS_IN_INCOGNITO);
+        return mProfile.isOffTheRecord();
     }
 
     private static class EntryViewHolder {