Introduces a search term extraction mechanism working for arbitrary search providers.

chrome/browser/google/google_util.h

Index: chrome/browser/google/google_util.h
diff --git a/chrome/browser/google/google_util.h b/chrome/browser/google/google_util.h
index f35ea0098b929bd9155f473768e7d6e2866f11ed..a4d468a28efbc75d82e84b6df96eaa9873daf148 100644
--- a/chrome/browser/google/google_util.h
+++ b/chrome/browser/google/google_util.h
@@ -10,7 +10,6 @@
 #include <string>
 
 #include "base/basictypes.h"
-#include "base/string16.h"
 
 class GURL;
 class Profile;
@@ -45,9 +44,6 @@ bool GetBrand(std::string* brand);
 // install. Returns false if the information is not available.
 bool GetReactivationBrand(std::string* brand);
 
-// Returns in the search terms used to create the Google search URL |url|.
-string16 GetSearchTermsFromGoogleSearchURL(const std::string& url);
-
 // WARNING: The following IsGoogleXXX() functions use heuristics to rule out
 // "obviously false" answers.  They do NOT guarantee that the string in question
 // is actually on a Google-owned domain, just that it looks plausible.  If you
@@ -86,6 +82,8 @@ bool IsGoogleHomePageUrl(const std::string& url);
 bool IsGoogleSearchUrl(const std::string& url);
 // True if |url| represents a valid Google search URL used by the Instant
 // Extended API.
+// TODO(beaudoin): Replace with the new mechanism based on the user's default
+// search engine. See TemplateURL.
 bool IsInstantExtendedAPIGoogleSearchUrl(const std::string& url);
 
 // True if a build is strictly organic, according to its brand code.