From ba0c0b134b09e6dd885409f3fe4fa080d3e0e272 Mon Sep 17 00:00:00 2001
From: Kainalu Hagiwara <kainaluh808@gmail.com>
Date: Tue, 11 Aug 2020 14:51:24 -0700
Subject: [PATCH] For #13329 - Remove tab history feature flag.

---
 .../mozilla/fenix/browser/BaseBrowserFragment.kt    |  7 ++-----
 .../components/toolbar/BrowserToolbarController.kt  | 13 ++++---------
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt b/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
index d2b1b2292..c78c5b86f 100644
--- a/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
@@ -812,11 +812,8 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler, Session
     }
 
     override fun onBackLongPressed(): Boolean {
-        if (FeatureFlags.tabHistory) {
-            findNavController().navigate(R.id.action_global_tabHistoryDialogFragment)
-            return true
-        }
-        return false
+        findNavController().navigate(R.id.action_global_tabHistoryDialogFragment)
+        return true
     }
 
     /**
diff --git a/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarController.kt b/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarController.kt
index 0668d8c2f..5fd5b8ec6 100644
--- a/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarController.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarController.kt
@@ -23,7 +23,6 @@ import mozilla.components.concept.engine.prompt.ShareData
 import mozilla.components.feature.session.SessionFeature
 import mozilla.components.support.base.feature.ViewBoundFeatureWrapper
 import mozilla.components.support.ktx.kotlin.isUrl
-import org.mozilla.fenix.FeatureFlags
 import org.mozilla.fenix.HomeActivity
 import org.mozilla.fenix.NavGraphDirections
 import org.mozilla.fenix.R
@@ -205,21 +204,17 @@ class DefaultBrowserToolbarController(
 
         Do exhaustive when (item) {
             is ToolbarMenu.Item.Back -> {
-                if (FeatureFlags.tabHistory && item.viewHistory) {
+                if (item.viewHistory) {
                     navController.navigate(R.id.action_global_tabHistoryDialogFragment)
-                } else if (!item.viewHistory) {
-                    sessionUseCases.goBack.invoke(currentSession)
                 } else {
-                    // Do nothing if tab history feature flag is off and item.viewHistory is true
+                    sessionUseCases.goBack.invoke(currentSession)
                 }
             }
             is ToolbarMenu.Item.Forward -> {
-                if (FeatureFlags.tabHistory && item.viewHistory) {
+                if (item.viewHistory) {
                     navController.navigate(R.id.action_global_tabHistoryDialogFragment)
-                } else if (!item.viewHistory) {
-                    sessionUseCases.goForward.invoke(currentSession)
                 } else {
-                    // Do nothing if tab history feature flag is off and item.viewHistory is true
+                    sessionUseCases.goForward.invoke(currentSession)
                 }
             }
             is ToolbarMenu.Item.Reload -> {