Shuffle web search stuff around to prepare for GoogleQuickSearchBox

- Move Google search classes under

- Change Google suggestion URI to one that doesn't look like
  a class name. The suggestion URI has never been published, so it should
  be fine to change.

- Put query in the URI path instead of a selection value.

Change-Id: Id177caf3d44ba9802cf3ba2d3187c00324eb6415
7 files changed