Factor parsing "ln=" to SuggestionAnswer

components/omnibox/browser/suggestion_answer.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/browser/suggestion_answer.h"
 
 #include <stddef.h>
 
 #include "base/i18n/rtl.h"
 #include "base/memory/ptr_util.h"
@@ skipping 164 matching lines @@
   AppendWithSpace(status_text_.get(), &result);
   return result;
 }
 
 // SuggestionAnswer ------------------------------------------------------------
 
 SuggestionAnswer::SuggestionAnswer() : type_(-1) {}
 SuggestionAnswer::SuggestionAnswer(const SuggestionAnswer& answer)
     : first_line_(answer.first_line_),
       second_line_(answer.second_line_),
-      type_(answer.type_) {}
+      type_(answer.type_),
+      second_line_size_(answer.second_line_size_) {}

[groby-ooo-7-16, 2016/06/23 20:49:27]

Since this is just a default copy ctor, let's do the right thing:

SuggestionAnswer::SuggestionAnswer(const SuggestionAnswer& answer) = default;

[Kevin Bailey, 2016/06/23 21:49:22]

sgtm

[Kevin Bailey, 2016/06/28 15:59:32]

Done.

 
 SuggestionAnswer::~SuggestionAnswer() {}
 
 // static
 std::unique_ptr<SuggestionAnswer> SuggestionAnswer::ParseAnswer(
     const base::DictionaryValue* answer_json) {
   auto result = base::WrapUnique(new SuggestionAnswer);
 
   const base::ListValue* lines_json;
   if (!answer_json->GetList(kAnswerJsonLines, &lines_json) ||
       lines_json->GetSize() != 2)
     return nullptr;
 
   const base::DictionaryValue* first_line_json;
   if (!lines_json->GetDictionary(0, &first_line_json) ||
       !ImageLine::ParseImageLine(first_line_json, &result->first_line_))
     return nullptr;
 
   const base::DictionaryValue* second_line_json;
   if (!lines_json->GetDictionary(1, &second_line_json) ||
       !ImageLine::ParseImageLine(second_line_json, &result->second_line_))
     return nullptr;
 
+  for (const auto& text_field : result->second_line_.text_fields()) {
+    if (text_field.has_num_lines()) {
+      result->second_line_size_ = text_field.num_lines();
+      break;
+    }
+  }
+
   return result;
 }
 
 bool SuggestionAnswer::Equals(const SuggestionAnswer& answer) const {
   return type_ == answer.type_ &&
          first_line_.Equals(answer.first_line_) &&
          second_line_.Equals(answer.second_line_);
 }
 
 void SuggestionAnswer::AddImageURLsTo(std::vector<GURL>* urls) const {
   if (first_line_.image_url().is_valid())
     urls->push_back(first_line_.image_url());
   if (second_line_.image_url().is_valid())
     urls->push_back(second_line_.image_url());
 }