Pass content to SearchUpdate rather than raw text

This is still less than ideal, but at least consolidates the
logic so we can later implement more content-specific handling.

Change-Id: Ic24a7ea2818f6eeb67453877dc5a31f110541ecf
Merge "Pass content to SearchUpdate rather than raw text"