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..0b6a27ee6e17b8917121b7047bc6fff8651bf211 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;
@@ -19,7 +18,6 @@ class Profile;
 // and state relating to Google Chrome distributions (such as RLZ).
 namespace google_util {
 
-// The query key that identifies a Google Extended API request for Instant.

[Joao da Silva, 2012/09/28 11:46:10]

Did you mean to delete kInstantExtendedAPIParam too? If not then please leave
the comment.

[dhollowa, 2012/09/28 18:06:29]

This is used in |UIThreadSearchTermsData::InstantEnabledParam| so it needs to
stay.  +1 that the comment should remain too.

[beaudoin, 2012/10/02 17:43:29]

Done.

 const char kInstantExtendedAPIParam[] = "espv";
 
 GURL LinkDoctorBaseURL();
@@ -45,9 +43,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
@@ -84,9 +79,6 @@ bool IsGoogleHostname(const std::string& host,
 bool IsGoogleHomePageUrl(const std::string& url);
 // True if |url| represents a valid Google search URL.
 bool IsGoogleSearchUrl(const std::string& url);
-// True if |url| represents a valid Google search URL used by the Instant
-// Extended API.
-bool IsInstantExtendedAPIGoogleSearchUrl(const std::string& url);

[dhollowa, 2012/09/28 18:06:29]

This should stay and continue to be used by search_tab_helper.cc.  Extracting
search terms is orthogonal to enabling the instant-extended experience on the
search-results page.

[beaudoin, 2012/10/02 17:43:29]

IMHO it's fishy to have two different mechanisms for detecting Google Search
URLs, one relying on a hardcoded procedure (this one) and another parameterized
by the TemplateURL data.

This is a deeper issue though, so reverting in that CL.

Done.

[dhollowa, 2012/10/02 18:14:13]

Yes, ideally search term extraction is completely independent of
extended-instant.  For now though we're governing them with a single flag.  The
search_tab_helper code has everything to do with extended-instant and nothing to
do with search term extraction.  So it is correct that search_tab_helper
continue to use this method, but that GetSearchTermsFromGoogleSearchURL doesn't
(and is gone now).

 
 // True if a build is strictly organic, according to its brand code.
 bool IsOrganic(const std::string& brand);