Bug 1009358 - Choose search engine
Merge pull request #20069 from benfrancis/1009358

Bug 1009358 - Choose search engine r=vingtetun