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

chrome/browser/google/google_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.
 //
 // Some Google related utility functions.
 
 #ifndef CHROME_BROWSER_GOOGLE_GOOGLE_UTIL_H__
 #define CHROME_BROWSER_GOOGLE_GOOGLE_UTIL_H__
 
 #include <string>
 
 #include "base/basictypes.h"
-#include "base/string16.h"
 
 class GURL;
 class Profile;
 
 // This namespace provides various helpers around handling Google-related URLs
 // 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();
 void SetMockLinkDoctorBaseURLForTesting();
 
 // Adds the Google locale string to the URL (e.g., hl=en-US).  This does not
 // check to see if the param already exists.
 GURL AppendGoogleLocaleParam(const GURL& url);
 
 // String version of AppendGoogleLocaleParam.
 std::string StringAppendGoogleLocaleParam(const std::string& url);
 
 // Adds the Google TLD string for the given profile to the URL (e.g., sd=com).
 // This does not check to see if the param already exists.
 GURL AppendGoogleTLDParam(Profile* profile, const GURL& url);
 
 // Returns in |brand| the brand code or distribution tag that has been
 // assigned to a partner. Returns false if the information is not available.
 bool GetBrand(std::string* brand);
 
 // Returns in |brand| the reactivation brand code or distribution tag
 // that has been assigned to a partner for reactivating a dormant chrome
 // 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
 // need to restrict some behavior to only happen on Google's officially-owned
 // domains, use TransportSecurityState::IsGooglePinnedProperty() instead.
 
 // Designate whether or not a URL checking function also checks for specific
 // subdomains, or only "www" and empty subdomains.
 enum SubdomainPermission {
   ALLOW_SUBDOMAIN,
@@ skipping 16 matching lines @@
                        PortPermission port_permission);
 // True if |host| is "[www.]google.<TLD>" with a valid TLD. If
 // |subdomain_permission| is ALLOW_SUBDOMAIN, we check against host
 // "*.google.<TLD>" instead.
 bool IsGoogleHostname(const std::string& host,
                       SubdomainPermission subdomain_permission);
 // True if |url| represents a valid Google home page URL.
 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);
 
 // True if a build should run as organic during first run. This uses
 // a slightly different set of brand codes from the standard IsOrganic
 // method.
 bool IsOrganicFirstRun(const std::string& brand);
 
 // True if |brand| is an internet cafe brand code.
 bool IsInternetCafeBrandCode(const std::string& brand);
 
 // This class is meant to be used only from test code, and sets the brand
 // code returned by the function GetBrand() above while the object exists.
 class BrandForTesting {
  public:
   explicit BrandForTesting(const std::string& brand);
   ~BrandForTesting();
 
  private:
   std::string brand_;
   DISALLOW_COPY_AND_ASSIGN(BrandForTesting);
 };
 
 }  // namespace google_util
 
 #endif  // CHROME_BROWSER_GOOGLE_GOOGLE_UTIL_H__