Bug 1046485 - Move search bar out of SearchFragment 

Oops, I messed up rebasing my changes from bug 1042415. This should really be `onSearch(trimmedQuery)`. So that's why we have a local variable.