Misc. cleanup:

chrome/browser/search_engines/util.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_SEARCH_ENGINES_UTIL_H_
 #define CHROME_BROWSER_SEARCH_ENGINES_UTIL_H_
 
 // This file contains utility functions for search engine functionality.
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string16.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 
 class Profile;
 class TemplateURL;
 class WDTypedResult;
 class WebDataService;
 
 // Returns the short name of the default search engine, or the empty string if
 // 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,
                                      const TemplateURL* original_turl);
 
 // Processes the results of WebDataService::GetKeywords, combining it with
 // prepopulated search providers to result in:
 //  * a set of template_urls (search providers). The caller owns the
 //    TemplateURL* returned in template_urls.
 //  * the default search provider (and if *default_search_provider is not NULL,
@@ skipping 40 matching lines @@
 // helper used by GetSearchProvidersUsingKeywordResult(), but is declared here
 // so it's accessible by unittests.
 void RemoveDuplicatePrepopulateIDs(
     WebDataService* service,
     const ScopedVector<TemplateURL>& prepopulated_urls,
     TemplateURL* default_search_provider,
     TemplateURLService::TemplateURLVector* template_urls,
     std::set<std::string>* removed_keyword_guids);
 
 #endif  // CHROME_BROWSER_SEARCH_ENGINES_UTIL_H_