Remove search::GetSearchTerms since it always returns empty string

chrome/browser/search/search.cc

Index: chrome/browser/search/search.cc
diff --git a/chrome/browser/search/search.cc b/chrome/browser/search/search.cc
index 63815c452eed4910bfd7d752003ce7e76c117383..78e9e8fb5816d991ad8464390158e085a6eb4f75 100644
--- a/chrome/browser/search/search.cc
+++ b/chrome/browser/search/search.cc
@@ -183,12 +183,6 @@ bool IsInstantURL(const GURL& url, Profile* profile) {
   return MatchesOriginAndPath(url, instant_url);
 }
 
-base::string16 GetSearchTermsImpl(const content::WebContents* contents,
-                                  const content::NavigationEntry* entry) {
-  // TODO(treib): Remove this and update callers accordingly. crbug.com/627747
-  return base::string16();
-}
-
 bool IsURLAllowedForSupervisedUser(const GURL& url, Profile* profile) {
 #if defined(ENABLE_SUPERVISED_USERS)
   SupervisedUserService* supervised_user_service =
@@ -306,33 +300,6 @@ bool IsQueryExtractionAllowedForURL(Profile* profile, const GURL& url) {
   return template_url && IsSuitableURLForInstant(url, template_url);
 }
 
-base::string16 GetSearchTermsFromNavigationEntry(
-    const content::NavigationEntry* entry) {
-  base::string16 search_terms;
-  if (entry)
-    entry->GetExtraData(sessions::kSearchTermsKey, &search_terms);
-  return search_terms;
-}
-
-base::string16 GetSearchTerms(const content::WebContents* contents) {
-  if (!contents)
-    return base::string16();
-
-  const content::NavigationEntry* entry =
-      contents->GetController().GetVisibleEntry();
-  if (!entry)
-    return base::string16();
-
-  if (IsInstantExtendedAPIEnabled()) {
-    InstantSupportState state =
-        GetInstantSupportStateFromNavigationEntry(*entry);

[Peter Kasting, 2016/08/13 05:03:44]

This was the only caller of this function, so it should be removed too.  In turn
that also implies removal of a bunch of related stuff (setter, conversion to
string, a key constant, maybe others).

[Marc Treib, 2016/08/16 12:00:17]

Thanks! Done.

-    if (state == INSTANT_SUPPORT_NO)
-      return base::string16();
-  }
-
-  return GetSearchTermsImpl(contents, entry);
-}
-
 bool ShouldAssignURLToInstantRenderer(const GURL& url, Profile* profile) {
   return url.is_valid() &&
          profile &&