Remove and deprecate SEARCH_SUGGEST_ANSWER

components/omnibox/autocomplete_match.cc

 // Copyright 2014 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 "components/omnibox/autocomplete_match.h"
 
 #include "base/i18n/time_formatting.h"
 #include "base/logging.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 137 matching lines @@
       IDR_OMNIBOX_SEARCH,         // SEARCH_SUGGEST
       IDR_OMNIBOX_SEARCH,         // SEARCH_SUGGEST_ENTITY
       IDR_OMNIBOX_SEARCH,         // SEARCH_SUGGEST_INFINITE
       IDR_OMNIBOX_SEARCH,         // SEARCH_SUGGEST_PERSONALIZED
       IDR_OMNIBOX_SEARCH,         // SEARCH_SUGGEST_PROFILE
       IDR_OMNIBOX_SEARCH,         // SEARCH_OTHER_ENGINE
       IDR_OMNIBOX_EXTENSION_APP,  // EXTENSION_APP
       IDR_OMNIBOX_SEARCH,         // CONTACT_DEPRECATED
       IDR_OMNIBOX_HTTP,           // BOOKMARK_TITLE
       IDR_OMNIBOX_HTTP,           // NAVSUGGEST_PERSONALIZED
-      IDR_OMNIBOX_SEARCH,         // SEARCH_SUGGEST_ANSWER
   };
 #else
   static const int kIcons[] = {
       IDR_OMNIBOX_HTTP,           // URL_WHAT_YOU_TYPE
       IDR_OMNIBOX_HISTORY,        // HISTORY_URL
       IDR_OMNIBOX_HISTORY,        // HISTORY_TITLE
       IDR_OMNIBOX_HISTORY,        // HISTORY_BODY
       IDR_OMNIBOX_HISTORY,        // HISTORY_KEYWORD
       IDR_OMNIBOX_HTTP,           // NAVSUGGEST
       IDR_OMNIBOX_SEARCH,         // SEARCH_WHAT_YOU_TYPED
       IDR_OMNIBOX_HISTORY,        // SEARCH_HISTORY
       IDR_OMNIBOX_SEARCH,         // SEARCH_SUGGEST
       IDR_OMNIBOX_SEARCH,         // SEARCH_SUGGEST_ENTITY
       IDR_OMNIBOX_SEARCH,         // SEARCH_SUGGEST_INFINITE
       IDR_OMNIBOX_SEARCH,         // SEARCH_SUGGEST_PERSONALIZED
       IDR_OMNIBOX_SEARCH,         // SEARCH_SUGGEST_PROFILE
       IDR_OMNIBOX_SEARCH,         // SEARCH_OTHER_ENGINE
       IDR_OMNIBOX_EXTENSION_APP,  // EXTENSION_APP
       IDR_OMNIBOX_SEARCH,         // CONTACT_DEPRECATED
       IDR_OMNIBOX_HTTP,           // BOOKMARK_TITLE
       IDR_OMNIBOX_HTTP,           // NAVSUGGEST_PERSONALIZED
-      IDR_OMNIBOX_SEARCH,         // SEARCH_SUGGEST_ANSWER
   };
 #endif
   static_assert(arraysize(kIcons) == AutocompleteMatchType::NUM_TYPES,
                 "icons array must have NUM_TYPES elements");
   return kIcons[type];
 }
 
 // static
 bool AutocompleteMatch::MoreRelevant(const AutocompleteMatch& elem1,
                                      const AutocompleteMatch& elem2) {
@@ skipping 155 matching lines @@
          type == AutocompleteMatchType::SEARCH_SUGGEST ||
          type == AutocompleteMatchType::SEARCH_OTHER_ENGINE ||
          IsSpecializedSearchType(type);
 }
 
 // static
 bool AutocompleteMatch::IsSpecializedSearchType(Type type) {
   return type == AutocompleteMatchType::SEARCH_SUGGEST_ENTITY ||
          type == AutocompleteMatchType::SEARCH_SUGGEST_INFINITE ||
          type == AutocompleteMatchType::SEARCH_SUGGEST_PERSONALIZED ||
-         type == AutocompleteMatchType::SEARCH_SUGGEST_PROFILE ||
-         type == AutocompleteMatchType::SEARCH_SUGGEST_ANSWER;
+         type == AutocompleteMatchType::SEARCH_SUGGEST_PROFILE;
 }
 
 // static
 TemplateURL* AutocompleteMatch::GetTemplateURLWithKeyword(
     TemplateURLService* template_url_service,
     const base::string16& keyword,
     const std::string& host) {
   if (template_url_service == NULL)
     return NULL;
   TemplateURL* template_url = keyword.empty() ?
@@ skipping 193 matching lines @@
         << " is unsorted in relation to last offset of " << last_offset
         << ". Provider: " << provider_name << ".";
     DCHECK_LT(i->offset, text.length())
         << " Classification of [" << i->offset << "," << text.length()
         << "] is out of bounds for \"" << text << "\". Provider: "
         << provider_name << ".";
     last_offset = i->offset;
   }
 }
 #endif