Remove the use of custom logic to determine search suggestion types.

ios/chrome/browser/ui/omnibox/omnibox_popup_material_view_controller.mm

 // Copyright (c) 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.
 
 #import "ios/chrome/browser/ui/omnibox/omnibox_popup_material_view_controller.h"
 
 #include <memory>
 
 #include "base/ios/ios_util.h"
 #include "base/mac/scoped_cftyperef.h"
@@ skipping 267 matching lines @@
   LayoutRect detailTextLabelLayout =
       LayoutRectMake(leadingPadding, CGRectGetWidth(self.view.bounds),
                      kDetailCellTopPadding, labelWidth, labelHeight);
   detailTextLabel.frame = LayoutRectGetRect(detailTextLabelLayout);
 
   // The detail text should be the URL (|match.contents|) for non-search
   // suggestions and the entity type (|match.description|) for search entity
   // suggestions. For all other search suggestions, |match.description| is the
   // name of the currently selected search engine, which for mobile we suppress.
   NSString* detailText = nil;
-  if (![self isSearchMatch:match.type])
+  if (!AutocompleteMatch::IsSearchType(match.type))
     detailText = base::SysUTF16ToNSString(match.contents);
   else if (match.type == AutocompleteMatchType::SEARCH_SUGGEST_ENTITY)
     detailText = base::SysUTF16ToNSString(match.description);
 
   if (answerPresent) {
     detailTextLabel.attributedText =
         [self attributedStringWithAnswerLine:match.answer->second_line()];
 
     // Answers specify their own limit on the number of lines to show but we
     // additionally cap this at 3 to guard against unreasonable values.
     const SuggestionAnswer::TextField& first_text_field =
         match.answer->second_line().text_fields()[0];
     if (first_text_field.has_num_lines() && first_text_field.num_lines() > 1)
       detailTextLabel.numberOfLines = MIN(3, first_text_field.num_lines());
     else
       detailTextLabel.numberOfLines = 1;
   } else {
     const ACMatchClassifications* classifications =
-        ![self isSearchMatch:match.type] ? &match.contents_class : nil;
+        !AutocompleteMatch::IsSearchType(match.type) ? &match.contents_class
+                                                     : nil;
     // The suggestion detail color should match the main text color for entity
     // suggestions. For non-search suggestions (URLs), a highlight color is used
     // instead.
     UIColor* suggestionDetailTextColor = nil;
     if (match.type == AutocompleteMatchType::SEARCH_SUGGEST_ENTITY) {
       suggestionDetailTextColor =
           _incognito ? SuggestionTextColorIncognito() : SuggestionTextColor();
     } else {
       suggestionDetailTextColor = SuggestionDetailTextColor();
     }
     DCHECK(suggestionDetailTextColor);
     detailTextLabel.attributedText =
         [self attributedStringWithString:detailText
                          classifications:classifications
                                smallFont:YES
                                    color:suggestionDetailTextColor
                                 dimColor:DimColor()];
   }
   [detailTextLabel setNeedsDisplay];
 
   OmniboxPopupTruncatingLabel* textLabel = row.textTruncatingLabel;
   [textLabel setTextAlignment:_alignment];
   LayoutRect textLabelLayout =
       LayoutRectMake(kTextCellLeadingPadding, CGRectGetWidth(self.view.bounds),
                      0, labelWidth, kTextLabelHeight);
   textLabel.frame = LayoutRectGetRect(textLabelLayout);
 
   // The text should be search term (|match.contents|) for searches, otherwise
   // page title (|match.description|).
-  base::string16 textString =
-      [self isSearchMatch:match.type] ? match.contents : match.description;
+  base::string16 textString = AutocompleteMatch::IsSearchType(match.type)
+                                  ? match.contents
+                                  : match.description;
   NSString* text = base::SysUTF16ToNSString(textString);
   const ACMatchClassifications* textClassifications =
-      [self isSearchMatch:match.type] ? &match.contents_class
-                                      : &match.description_class;
+      AutocompleteMatch::IsSearchType(match.type) ? &match.contents_class
+                                                  : &match.description_class;
 
   // If for some reason the title is empty, copy the detailText.
   if ([text length] == 0 && [detailText length] != 0) {
     text = detailText;
   }
   // Center the textLabel if detailLabel is empty.
   if (!answerPresent && [detailText length] == 0) {
     textLabel.center = CGPointMake(textLabel.center.x, floor(kRowHeight / 2));
     textLabel.frame = AlignRectToPixel(textLabel.frame);
   } else {
@@ skipping 309 matching lines @@
   for (OmniboxPopupMaterialRow* row in _rows) {
     row.highlighted = NO;
   }
 }
 
 // Set text alignment for popup cells.
 - (void)setTextAlignment:(NSTextAlignment)alignment {
   _alignment = alignment;
 }
 
-- (BOOL)isSearchMatch:(const AutocompleteMatch::Type&)type {
-  return (type == AutocompleteMatchType::NAVSUGGEST ||
-          type == AutocompleteMatchType::SEARCH_WHAT_YOU_TYPED ||
-          type == AutocompleteMatchType::SEARCH_HISTORY ||
-          type == AutocompleteMatchType::SEARCH_SUGGEST ||
-          type == AutocompleteMatchType::SEARCH_SUGGEST_ENTITY ||
-          type == AutocompleteMatchType::SEARCH_OTHER_ENGINE);
-}
-
 - (NSMutableAttributedString*)
 attributedStringWithString:(NSString*)text
            classifications:(const ACMatchClassifications*)classifications
                  smallFont:(BOOL)smallFont
                      color:(UIColor*)defaultColor
                   dimColor:(UIColor*)dimColor {
   if (text == nil)
     return nil;
 
   UIFont* fontRef =
@@ skipping 100 matching lines @@
     // The delete button never disappears if you don't call this after a tap.
     // It doesn't seem to be required anywhere else.
     [_rows[indexPath.row] prepareForReuse];
     const AutocompleteMatch& match =
         ((const AutocompleteResult&)_currentResult).match_at(indexPath.row);
     _popupView->DeleteMatch(match);
   }
 }
 
 @end