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 136 matching lines @@
     IDR_OMNIBOX_SEARCH,
     IDR_OMNIBOX_SEARCH,
     IDR_OMNIBOX_SEARCH,
     IDR_OMNIBOX_SEARCH,
     IDR_OMNIBOX_SEARCH,
     IDR_OMNIBOX_SEARCH,
     IDR_OMNIBOX_EXTENSION_APP,
     IDR_OMNIBOX_SEARCH,
     IDR_OMNIBOX_HTTP,
     IDR_OMNIBOX_HTTP,
-    IDR_OMNIBOX_SEARCH,

[groby-ooo-7-16, 2014/12/23 20:15:22]

Question: Do we still want answers to have a search icon attached?

[Justin Donnelly, 2014/12/23 21:08:40]

The icon type will be determined by the existing type of whatever an answer is
attached to. IIRC, this is SEARCH_SUGGEST, SEARCH_SUGGEST_PERSONALIZED, and
SEARCH_HISTORY all of which have a search icon.

   };
   COMPILE_ASSERT(arraysize(icons) == AutocompleteMatchType::NUM_TYPES,
                  icons_array_must_match_type_enum);
   return icons[type];
 }
 
 // static
 bool AutocompleteMatch::MoreRelevant(const AutocompleteMatch& elem1,
                                      const AutocompleteMatch& elem2) {
   // For equal-relevance matches, we sort alphabetically, so that providers
@@ skipping 154 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