Misc. cleanup:

chrome/browser/search_engines/util.h

Index: chrome/browser/search_engines/util.h
===================================================================
--- chrome/browser/search_engines/util.h	(revision 208964)
+++ chrome/browser/search_engines/util.h	(working copy)
@@ -23,6 +23,10 @@
 // none is set. |profile| may be NULL.
 string16 GetDefaultSearchEngineName(Profile* profile);
 
+// Returns a GURL that searches for |terms| using the default search engine of
+// |profile|.
+GURL GetDefaultSearchURLForSearchTerms(Profile* profile, const string16& terms);

[Jered, 2013/06/28 21:57:28]

I'm surprised this doesn't already exist. This seems like the main thing you
would want to do with a database of search engine URLs.

[Peter Kasting, 2013/06/28 22:16:02]

Well, as you can tell from this patch, I can use this in three or four existing
places.  But beyond that there aren't that many places in the frontend that need
to search for things -- the omnibox is the chief originator of searches, and it
doesn't use this kind of a simple helper.

+
 // Modifies |prepopulated_url| so that it contains user-modified fields from
 // |original_turl|. Both URLs must have the same prepopulate_id.
 void MergeIntoPrepopulatedEngineData(TemplateURLData* prepopulated_url,