Factor parsing "ln=" to SuggestionAnswer

chrome/browser/ui/cocoa/omnibox/omnibox_popup_cell.mm

 // Copyright 2013 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 "chrome/browser/ui/cocoa/omnibox/omnibox_popup_cell.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <cmath>
@@ skipping 250 matching lines @@
     if (end == base::string16::npos)
       break;
     [result appendAttributedString:CreateAnswerStringHelper(
                                        text.substr(begin, end - begin),
                                        style_type, true, is_dark_theme)];
     begin = end + end_tag.length();
   }
   return result.autorelease();
 }
 
-int ParseNumLines(const SuggestionAnswer::TextFields& text_fields) {
-  for (const SuggestionAnswer::TextField& text_field : text_fields) {
-    if (text_field.has_num_lines() && text_field.num_lines() > 1)
-      return text_field.num_lines();
-  }
-  return 1;
-}
-
 NSAttributedString* CreateAnswerLine(const SuggestionAnswer::ImageLine& line,
                                      BOOL is_dark_theme) {
   base::scoped_nsobject<NSMutableAttributedString> answer_string(
       [[NSMutableAttributedString alloc] init]);
   DCHECK(!line.text_fields().empty());
   for (const SuggestionAnswer::TextField& text_field : line.text_fields()) {
     [answer_string appendAttributedString:CreateAnswerString(text_field.text(),
                                                              text_field.type(),
                                                              is_dark_theme)];
   }
@@ skipping 148 matching lines @@
         base::UTF8ToUTF16(
             match.GetAdditionalInfo(kACMatchPropertyContentsPrefix)),
         ContentTextColor(isDarkTheme), textAlignment) retain];
 
     isAnswer_ = !!match.answer;
     if (isAnswer_) {
       contents_ =
           [CreateAnswerLine(match.answer->first_line(), isDarkTheme) retain];
       description_ =
           [CreateAnswerLine(match.answer->second_line(), isDarkTheme) retain];
-      max_lines_ = ParseNumLines(match.answer->second_line().text_fields());
+      max_lines_ = match.answer->second_line().num_text_lines();
     } else {
       contents_ = [CreateClassifiedAttributedString(
           match.contents, ContentTextColor(isDarkTheme), match.contents_class,
           isDarkTheme) retain];
       if (!match.description.empty()) {
         description_ = [CreateClassifiedAttributedString(
             match.description, DimTextColor(isDarkTheme),
             match.description_class, isDarkTheme) retain];
       }
       max_lines_ = 1;
@@ skipping 269 matching lines @@
   base::string16 raw_separator =
       l10n_util::GetStringUTF16(IDS_AUTOCOMPLETE_MATCH_DESCRIPTION_SEPARATOR);
   return CreateAttributedString(raw_separator, DimTextColor(isDarkTheme));
 }
 
 + (CGFloat)getContentAreaWidth:(NSRect)cellFrame {
   return NSWidth(cellFrame) - TextStartOffset();
 }
 
 @end