Fix #2908: Selecting a single SE doesn't show up in quick search engine list

Client/Frontend/Browser/BrowserViewController.swift

@@ -1131,28 +1131,29 @@ class BrowserViewController: UIViewController {
     }
 
     fileprivate func showSearchController() {
-        if searchController != nil {
-            return
-        }
+        if searchController != nil { return }
 
         let tabType = TabType.of(tabManager.selectedTab)
         searchController = SearchViewController(forTabType: tabType)
-        searchController!.searchEngines = profile.searchEngines
-        searchController!.searchDelegate = self
-        searchController!.profile = self.profile
+
+        guard let searchController = searchController else { return }
+
+        searchController.searchEngines = profile.searchEngines
+        searchController.searchDelegate = self
+        searchController.profile = self.profile
 
         searchLoader = SearchLoader(profile: profile, topToolbar: topToolbar)
-        searchLoader?.addListener(searchController!)
+        searchLoader?.addListener(searchController)
 
-        addChild(searchController!)
-        view.addSubview(searchController!.view)
-        searchController!.view.snp.makeConstraints { make in
+        addChild(searchController)
+        view.addSubview(searchController.view)
+        searchController.view.snp.makeConstraints { make in
             make.top.equalTo(self.topToolbar.snp.bottom)
             make.left.right.bottom.equalTo(self.view)
             return
         }
 
-        searchController!.didMove(toParent: self)
+        searchController.didMove(toParent: self)
     }
 
     func updateTabsBarVisibility() {

Client/Frontend/Browser/Search/SearchViewController.swift

@@ -185,8 +185,15 @@ class SearchViewController: SiteTableViewController, KeyboardHelperDelegate, Loa
     }
 
     // If the user only has a single quick search engine, it is also their default one.
-    // In that case, we count it as if there are no quick suggestions to show.
+    // In that case, we count it as if there are no quick suggestions to show
+    // Unless Default Search Engine is different than Quick Search Engine
     private var hasQuickSearchEngines: Bool {
+        let isDefaultEngineQuickEngine = searchEngines.defaultEngine().engineID == quickSearchEngines.first?.engineID
+
+        if quickSearchEngines.count == 1 {
+            return !isDefaultEngineQuickEngine
+        }
+
         return quickSearchEngines.count > 1
     }