GestureNav: Remove NavigationSheet variation option

Navigation sheet won't be included in the gesture navigation feature.
This CL removes the option from #overscroll-history-navigation in
chrome://flags.

The sheet is now only used for history popup triggered by long press
on back button.

Bug: 1126341
Change-Id: Ib4739c30fe5fbbd8d56cb1ae990313f579f60bad
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2400786Reviewed-by: Donn Denman <donnd@chromium.org>
Reviewed-by: Steven Holte <holte@chromium.org>
Commit-Queue: Jinsuk Kim <jinsukkim@chromium.org>
Cr-Commit-Position: refs/heads/master@{#806943}

chrome/android/java/src/org/chromium/chrome/browser/gesturenav/NavigationSheet.java

@@ -8,7 +8,6 @@ import android.content.Context;
 import android.view.View;
 
 import org.chromium.base.supplier.Supplier;
-import org.chromium.chrome.browser.flags.ChromeFeatureList;
 import org.chromium.components.browser_ui.bottomsheet.BottomSheetController;
 import org.chromium.content_public.browser.NavigationHistory;
 
@@ -16,9 +15,6 @@ import org.chromium.content_public.browser.NavigationHistory;
  * Interface that defines the methods for controlling Navigation sheet.
  */
 public interface NavigationSheet {
-    // Field trial variation key that enables navigation sheet.
-    static final String NAVIGATION_SHEET_ENABLED_KEY = "overscroll_history_navigation_bottom_sheet";
-
     /**
      * Delegate performing navigation-related operations/providing the required info.
      */
@@ -51,10 +47,7 @@ public interface NavigationSheet {
      * @return {@code true} if navigation sheet is enabled.
      */
     static boolean isEnabled() {
-        return ChromeFeatureList.isInitialized()
-                && ChromeFeatureList.getFieldTrialParamByFeatureAsBoolean(
-                        ChromeFeatureList.OVERSCROLL_HISTORY_NAVIGATION,
-                        NAVIGATION_SHEET_ENABLED_KEY, false);
+        return false;
     }
 
     /**

chrome/android/javatests/src/org/chromium/chrome/browser/gesturenav/NavigationSheetTest.java

@@ -163,9 +163,7 @@ public class NavigationSheetTest {
     @MediumTest
     @Restriction(UiRestriction.RESTRICTION_TYPE_PHONE)
     @CommandLineFlags.Add({"enable-features=OverscrollHistoryNavigation<GestureNavigation",
-            "force-fieldtrials=GestureNavigation/Enabled",
-            "force-fieldtrial-params=GestureNavigation.Enabled:"
-                    + "overscroll_history_navigation_bottom_sheet/true"})
+            "force-fieldtrials=GestureNavigation/Enabled"})
     public void
     testLongPressBackTriggering() {
         KeyEvent event = new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_BACK);
@@ -182,9 +180,7 @@ public class NavigationSheetTest {
     @SmallTest
     @Restriction(UiRestriction.RESTRICTION_TYPE_PHONE)
     @CommandLineFlags.Add({"enable-features=OverscrollHistoryNavigation<GestureNavigation",
-            "force-fieldtrials=GestureNavigation/Enabled",
-            "force-fieldtrial-params=GestureNavigation.Enabled:"
-                    + "overscroll_history_navigation_bottom_sheet/true"})
+            "force-fieldtrials=GestureNavigation/Enabled"})
     public void
     testLongPressBackTriggering_Cancellation() throws ExecutionException {
         ChromeTabbedActivity activity = mActivityTestRule.getActivity();

chrome/browser/about_flags.cc

@@ -1495,12 +1495,6 @@ const FeatureEntry::FeatureVariation
          base::size(kTranslateForceTriggerOnEnglishGeo), nullptr},
         {"(Zero threshold)", kTranslateForceTriggerOnEnglishBackoff,
          base::size(kTranslateForceTriggerOnEnglishBackoff), nullptr}};
-
-const FeatureEntry::FeatureParam kOverscrollHistoryNavigationBottomSheet[] = {
-    {"overscroll_history_navigation_bottom_sheet", "true"}};
-const FeatureEntry::FeatureVariation kOverscrollHistoryNavigationVariations[] =
-    {{"Navigation sheet", kOverscrollHistoryNavigationBottomSheet,
-      base::size(kOverscrollHistoryNavigationBottomSheet), nullptr}};
 #endif  // defined(OS_ANDROID)
 
 #if defined(OS_ANDROID)
@@ -2782,12 +2776,8 @@ const FeatureEntry kFeatureEntries[] = {
      flag_descriptions::kOverscrollHistoryNavigationName,
      flag_descriptions::kOverscrollHistoryNavigationDescription,
      kOsAura | kOsAndroid,
-#if defined(OS_ANDROID)
-     FEATURE_WITH_PARAMS_VALUE_TYPE(features::kOverscrollHistoryNavigation,
-                                    kOverscrollHistoryNavigationVariations,
-                                    "OverscrollNavigation")},
-#else
      FEATURE_VALUE_TYPE(features::kOverscrollHistoryNavigation)},
+#if !defined(OS_ANDROID)
     {"pull-to-refresh", flag_descriptions::kPullToRefreshName,
      flag_descriptions::kPullToRefreshDescription, kOsAura,
      MULTI_VALUE_TYPE(kPullToRefreshChoices)},

testing/variations/fieldtrial_testing_config.json

@@ -3027,9 +3027,6 @@
             "experiments": [
                 {
                     "name": "Enabled",
-                    "params": {
-                        "overscroll_history_navigation_bottom_sheet": "false"
-                    },
                     "enable_features": [
                         "OverscrollHistoryNavigation"
                     ]