From aef087aae08510e7e82f9d6d5cfeaab082c73364 Mon Sep 17 00:00:00 2001
From: Sawyer Blatz <sdblatz@gmail.com>
Date: Fri, 6 Sep 2019 09:03:24 -0700
Subject: [PATCH] No issue: Removes unused nestedScrollQuickActionView (#5143)

---
 .../main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt | 3 +--
 .../fenix/components/toolbar/BrowserToolbarController.kt       | 1 -
 .../components/toolbar/DefaultBrowserToolbarControllerTest.kt  | 3 ---
 3 files changed, 1 insertion(+), 6 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 50bb47b2c..5d103fa58 100644
--- a/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
@@ -53,7 +53,6 @@ import org.mozilla.fenix.FeatureFlags
 import org.mozilla.fenix.HomeActivity
 import org.mozilla.fenix.IntentReceiverActivity
 import org.mozilla.fenix.R
-import org.mozilla.fenix.theme.ThemeManager
 import org.mozilla.fenix.collections.CreateCollectionViewModel
 import org.mozilla.fenix.components.FenixSnackbar
 import org.mozilla.fenix.components.FindInPageIntegration
@@ -72,6 +71,7 @@ import org.mozilla.fenix.ext.enterToImmersiveMode
 import org.mozilla.fenix.ext.requireComponents
 import org.mozilla.fenix.quickactionsheet.QuickActionSheetBehavior
 import org.mozilla.fenix.settings.SupportUtils
+import org.mozilla.fenix.theme.ThemeManager
 import org.mozilla.fenix.utils.Settings
 
 /**
@@ -157,7 +157,6 @@ abstract class BaseBrowserFragment : Fragment(), BackHandler, SessionManager.Obs
                 findNavController(),
                 (activity as HomeActivity).browsingModeManager,
                 findInPageLauncher = { findInPageIntegration.withFeature { it.launch() } },
-                nestedScrollQuickActionView = nestedScrollQuickAction,
                 engineView = engineView,
                 customTabSession = customTabSessionId?.let { sessionManager.findSessionById(it) },
                 viewModel = viewModel,
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 18856c317..8ef6f0fbb 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
@@ -43,7 +43,6 @@ class DefaultBrowserToolbarController(
     private val navController: NavController,
     private val browsingModeManager: BrowsingModeManager,
     private val findInPageLauncher: () -> Unit,
-    private val nestedScrollQuickActionView: NestedScrollView,
     private val engineView: EngineView,
     private val customTabSession: Session?,
     private val viewModel: CreateCollectionViewModel,
diff --git a/app/src/test/java/org/mozilla/fenix/components/toolbar/DefaultBrowserToolbarControllerTest.kt b/app/src/test/java/org/mozilla/fenix/components/toolbar/DefaultBrowserToolbarControllerTest.kt
index bcbace901..c43a5de0a 100644
--- a/app/src/test/java/org/mozilla/fenix/components/toolbar/DefaultBrowserToolbarControllerTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/components/toolbar/DefaultBrowserToolbarControllerTest.kt
@@ -49,7 +49,6 @@ class DefaultBrowserToolbarControllerTest {
     private val browsingModeManager: BrowsingModeManager = mockk(relaxed = true)
     private var navController: NavController = mockk(relaxed = true)
     private var findInPageLauncher: () -> Unit = mockk(relaxed = true)
-    private val nestedScrollQuickActionView: NestedScrollView = mockk(relaxed = true)
     private val engineView: EngineView = mockk(relaxed = true)
     private val currentSession: Session = mockk(relaxed = true)
     private val viewModel: CreateCollectionViewModel = mockk(relaxed = true)
@@ -69,7 +68,6 @@ class DefaultBrowserToolbarControllerTest {
             navController = navController,
             browsingModeManager = browsingModeManager,
             findInPageLauncher = findInPageLauncher,
-            nestedScrollQuickActionView = nestedScrollQuickActionView,
             engineView = engineView,
             customTabSession = null,
             viewModel = viewModel,
@@ -351,7 +349,6 @@ class DefaultBrowserToolbarControllerTest {
             navController = navController,
             browsingModeManager = browsingModeManager,
             findInPageLauncher = findInPageLauncher,
-            nestedScrollQuickActionView = nestedScrollQuickActionView,
             engineView = engineView,
             customTabSession = currentSession,
             viewModel = viewModel,