nsIBrowserSearchService::currentEngine and nsIBrowserSearchService::defaultEngine are the same thing. We should remove one of them. Currently, defaultEngine is listed as an alias for currentEngine in the interface file. However I think it makes more sense to keep defaultEngine, as that's what we set in the UX, it fits closer to how we normally discuss the default engine, and it fits with nsIBrowserSearchService::originalDefaultEngine. I'll set up some mentored bugs blocking this to get this transition done and the currentEngine interface removed.

Siddhant is going to take a look at doing this.

All instances of nsIBrowserSearchService::currentEngine have been replaced by nsIBrowserSearchService::defaultEngine. Dropping this variable now.

@Siddhant, Could you try rebasing the patch please? Landing just failed with: We're sorry, Autoland could not rebase your commits for you automatically. Please manually rebase your commits and try again. (255, "applying /tmp/tmpp_T3xj unable to find 'browser/components/search/test/browser_oneOffHeader.js' for patching (use '--prefix' to apply patch relative to the current directory) 1 out of 1 hunks FAILED -- saving rejects to file browser/components/search/test/browser_oneOffHeader.js.rej abort: patch failed to apply", '')

Pushed by mbanner@mozilla.com: https://hg.mozilla.org/integration/autoland/rev/74d97073c54b Dropping nsIBrowserSearchService::currentEngine in favour of defaultEngine. r=Standard8

Thank you.

I see that this updated the XPIDL interface, but the UUID wasn't changed to indicate to binary components that it did. Can you do a followup?

We stopped the practice of bumping the uuid for interfaces a while back - we no longer do that.

Commit pushed to master at https://github.com/mozilla/activity-stream https://github.com/mozilla/activity-stream/commit/bea035f1836519f3b8a30d24892ba24c8174c9d8 Port Bug 1453264 - Dropping nsIBrowserSearchService::currentEngine in favour of defaultEngine. r=Standard8