Use new SearchEngineProvider interface.

app/src/main/java/org/mozilla/fenix/components/UseCases.kt

@@ -15,6 +15,7 @@ import mozilla.components.feature.downloads.DownloadsUseCases
 import mozilla.components.feature.pwa.WebAppShortcutManager
 import mozilla.components.feature.pwa.WebAppUseCases
 import mozilla.components.feature.search.SearchUseCases
+import mozilla.components.browser.search.ext.toDefaultSearchEngineProvider
 import mozilla.components.feature.session.SessionUseCases
 import mozilla.components.feature.session.SettingsUseCases
 import mozilla.components.feature.session.TrackingProtectionUseCases
@@ -51,7 +52,7 @@ class UseCases(
     /**
      * Use cases that provide search engine integration.
      */
-    val searchUseCases by lazy { SearchUseCases(context, store, searchEngineManager, sessionManager) }
+    val searchUseCases by lazy { SearchUseCases(context, store, searchEngineManager.toDefaultSearchEngineProvider(context), sessionManager) }
 
     /**
      * Use cases that provide settings management.

app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarView.kt

@@ -9,6 +9,7 @@ import androidx.core.graphics.BlendModeColorFilterCompat.createBlendModeColorFil
 import androidx.core.graphics.BlendModeCompat.SRC_IN
 import androidx.core.graphics.drawable.toBitmap
 import mozilla.components.browser.awesomebar.BrowserAwesomeBar
+import mozilla.components.browser.search.DefaultSearchEngineProvider
 import mozilla.components.browser.search.SearchEngine
 import mozilla.components.browser.session.Session
 import mozilla.components.concept.awesomebar.AwesomeBar
@@ -19,6 +20,7 @@ import mozilla.components.feature.awesomebar.provider.SearchActionProvider
 import mozilla.components.feature.awesomebar.provider.SearchSuggestionProvider
 import mozilla.components.feature.awesomebar.provider.SessionSuggestionProvider
 import mozilla.components.feature.search.SearchUseCases
+import mozilla.components.browser.search.ext.toDefaultSearchEngineProvider
 import mozilla.components.feature.syncedtabs.DeviceIndicators
 import mozilla.components.feature.session.SessionUseCases
 import mozilla.components.feature.syncedtabs.SyncedTabsStorageSuggestionProvider
@@ -146,7 +148,7 @@ class AwesomeBarView(
         defaultSearchSuggestionProvider =
             SearchSuggestionProvider(
                 context = activity,
-                searchEngineManager = components.search.searchEngineManager,
+                defaultSearchEngineProvider = components.search.searchEngineManager.toDefaultSearchEngineProvider(activity),
                 searchUseCase = searchUseCase,
                 fetchClient = components.core.client,
                 mode = SearchSuggestionProvider.Mode.MULTIPLE_SUGGESTIONS,
@@ -159,9 +161,7 @@ class AwesomeBarView(
 
         defaultSearchActionProvider =
             SearchActionProvider(
-                searchEngineGetter = suspend {
-                    components.search.searchEngineManager.getDefaultSearchEngineAsync(activity)
-                },
+                defaultSearchEngineProvider = components.search.searchEngineManager.toDefaultSearchEngineProvider(activity),
                 searchUseCase = searchUseCase,
                 icon = searchBitmap,
                 showDescription = false
@@ -313,7 +313,10 @@ class AwesomeBarView(
 
             listOf(
                 SearchActionProvider(
-                    searchEngineGetter = suspend { searchEngine },
+                    defaultSearchEngineProvider = object : DefaultSearchEngineProvider {
+                        override fun getDefaultSearchEngine(): SearchEngine? = searchEngine
+                        override suspend fun retrieveDefaultSearchEngine(): SearchEngine? = searchEngine
+                    },
                     searchUseCase = shortcutSearchUseCase,
                     icon = searchBitmap
                 ),