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 62 matching lines @@
   // URL should not be used because Suggest is disabled.
   // Not used anymore, see crbug.com/340424.
   // NEW_TAB_URL_SUGGEST_OFF = 5,
 
   // URL should not be used because it is blocked for a supervised user.
   NEW_TAB_URL_BLOCKED = 6,
 
   NEW_TAB_URL_MAX
 };
 
-// Used to set the Instant support state of the Navigation entry.
-const char kInstantSupportStateKey[] = "instant_support_state";
-
-const char kInstantSupportEnabled[] = "Instant support enabled";
-const char kInstantSupportDisabled[] = "Instant support disabled";
-const char kInstantSupportUnknown[] = "Instant support unknown";
-
 base::Feature kUseGoogleLocalNtp {
   "UseGoogleLocalNtp", base::FEATURE_DISABLED_BY_DEFAULT
 };
 
-InstantSupportState StringToInstantSupportState(const base::string16& value) {
-  if (value == base::ASCIIToUTF16(kInstantSupportEnabled))
-    return INSTANT_SUPPORT_YES;
-  else if (value == base::ASCIIToUTF16(kInstantSupportDisabled))
-    return INSTANT_SUPPORT_NO;
-  else
-    return INSTANT_SUPPORT_UNKNOWN;
-}
-
-base::string16 InstantSupportStateToString(InstantSupportState state) {
-  switch (state) {
-    case INSTANT_SUPPORT_NO:
-      return base::ASCIIToUTF16(kInstantSupportDisabled);
-    case INSTANT_SUPPORT_YES:
-      return base::ASCIIToUTF16(kInstantSupportEnabled);
-    case INSTANT_SUPPORT_UNKNOWN:
-      return base::ASCIIToUTF16(kInstantSupportUnknown);
-  }
-  return base::ASCIIToUTF16(kInstantSupportUnknown);
-}
-
 TemplateURL* GetDefaultSearchProviderTemplateURL(Profile* profile) {
   if (profile) {
     TemplateURLService* template_url_service =
         TemplateURLServiceFactory::GetForProfile(profile);
     if (template_url_service)
       return template_url_service->GetDefaultSearchProvider();
   }
   return NULL;
 }
 
@@ skipping 44 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 97 matching lines @@
     template_url->ExtractSearchTermsFromURL(
         url, UIThreadSearchTermsData(profile), &search_terms);
   return search_terms;
 }
 
 bool IsQueryExtractionAllowedForURL(Profile* profile, const GURL& url) {
   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);
-    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 176 matching lines @@
     return false;
 
   if (IsInstantNTPURL(*url, profile)) {
     *url = GURL(chrome::kChromeUINewTabURL);
     return true;
   }
 
   return false;
 }
 
-void SetInstantSupportStateInNavigationEntry(InstantSupportState state,
-                                             content::NavigationEntry* entry) {
-  if (!entry)
-    return;
-
-  entry->SetExtraData(kInstantSupportStateKey,
-                      InstantSupportStateToString(state));
-}
-
-InstantSupportState GetInstantSupportStateFromNavigationEntry(
-    const content::NavigationEntry& entry) {
-  base::string16 value;
-  if (!entry.GetExtraData(kInstantSupportStateKey, &value))
-    return INSTANT_SUPPORT_UNKNOWN;
-
-  return StringToInstantSupportState(value);
-}
-
 }  // namespace search