Remove search::GetSearchTerms since it always returns empty string

chrome/browser/search/search.cc

 // Copyright 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.
 
 #include "chrome/browser/search/search.h"
 
 #include <stddef.h>
 
 #include "base/command_line.h"
 #include "base/feature_list.h"
@@ skipping 165 matching lines @@
   const TemplateURLRef& instant_url_ref = template_url->instant_url_ref();
   UIThreadSearchTermsData search_terms_data(profile);
   const GURL instant_url = TemplateURLRefToGURL(
       instant_url_ref, search_terms_data, false, false);
   if (!instant_url.is_valid())
     return false;
 
   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 =
       SupervisedUserServiceFactory::GetForProfile(profile);
   SupervisedUserURLFilter* url_filter =
       supervised_user_service->GetURLFilterForUIThread();
   if (url_filter->GetFilteringBehaviorForURL(url) ==
           SupervisedUserURLFilter::BLOCK) {
     return false;
   }
@@ skipping 92 matching lines @@
   }
 
   TemplateURL* template_url = GetDefaultSearchProviderTemplateURL(profile);
   base::string16 search_terms;
   if (template_url)
     template_url->ExtractSearchTermsFromURL(
         url, UIThreadSearchTermsData(profile), &search_terms);
   return search_terms;
 }
 
 bool IsQueryExtractionAllowedForURL(Profile* profile, const GURL& url) {

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

Eventually you'll want to rip out this, IsSuitableURLForInstant(), and every
other function that mentions "QueryExtraction", "SearchTermsReplacement", or the
like.

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

Yup, probably. But as of now, it's still used in a bunch of places, and I'm
trying to be careful so that I don't break anything in the process

   TemplateURL* template_url = GetDefaultSearchProviderTemplateURL(profile);
   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 &&
          IsInstantExtendedAPIEnabled() &&
          (url.SchemeIs(chrome::kChromeSearchScheme) ||
           IsInstantURL(url, profile));
 }
 
 bool IsRenderedInInstantProcess(const content::WebContents* contents,
                                 Profile* profile) {
@@ skipping 218 matching lines @@
       kUseAltInstantURL, false, flags);
 }
 
 bool ShouldUseSearchPathForInstant() {
   FieldTrialFlags flags;
   return GetFieldTrialInfo(&flags) && GetBoolValueForFlagWithDefault(
       kUseSearchPathForInstant, false, flags);
 }
 
 }  // namespace search