Factor parsing "ln=" to SuggestionAnswer

components/omnibox/browser/suggestion_answer_unittest.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 "base/json/json_reader.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
@@ skipping 181 matching lines @@
       "  { \"il\": { \"t\": [{ \"t\": \"text\", \"tt\": 8 }] } }, "
       "  { \"il\": { \"t\": [{ \"t\": \"other text\", \"tt\": 5 }], "
       "              \"i\": { \"d\": \"//example.com/foo.jpg\" } } } "
       "] }";
   ASSERT_TRUE(ParseAnswer(json));
 }
 
 TEST(SuggestionAnswerTest, ValidPropertyValues) {
   std::string json =
       "{ \"l\": ["
-      "  { \"il\": { \"t\": [{ \"t\": \"text\", \"tt\": 8, \"ln\": 3 }, "
+      "  { \"il\": { \"t\": [{ \"t\": \"text\", \"tt\": 8 }, "
       "                      { \"t\": \"moar text\", \"tt\": 0 }], "
       "              \"i\": { \"d\": \"//example.com/foo.jpg\" } } }, "
-      "  { \"il\": { \"t\": [{ \"t\": \"other text\", \"tt\": 5 }], "
+      "  { \"il\": { \"t\": [{ \"t\": \"other text\", \"tt\": 5, \"ln\": 3 }], "
       "              \"at\": { \"t\": \"slatfatf\", \"tt\": 42 }, "
       "              \"st\": { \"t\": \"oh hi, Mark\", \"tt\": 729347 } } } "
       "] }";
   std::unique_ptr<SuggestionAnswer> answer = ParseAnswer(json);
   ASSERT_TRUE(answer);
   answer->set_type(420527);
   EXPECT_EQ(420527, answer->type());
 
   const SuggestionAnswer::ImageLine& first_line = answer->first_line();
   EXPECT_EQ(2U, first_line.text_fields().size());
   EXPECT_EQ(base::UTF8ToUTF16("text"), first_line.text_fields()[0].text());
   EXPECT_EQ(8, first_line.text_fields()[0].type());
-  EXPECT_TRUE(first_line.text_fields()[0].has_num_lines());

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

Why did this check move from the first to the second line? 

Does the protocol spec actually say that ln can show up anywhere, but affects
only the second line? (In which case we should fix the spec)

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

Since ParseTextField is looking for it, we can handle it in any text field,
including 'additional text' and 'status text'. Thus, I had no qualms about
testing for it in the first line. But practically, it will only be in the answer
of a multiline answer.

They only specified it in a reply to jdonnely@. (He asked, how are we supposed
to know that an answer is a dictionary definition and that we're supposed to
allow it go beyond one line, and they said, it will have a "ln" field.) Here is
the example that they give in the document:

[
  {"il":
    {"at":
      {"t": "\u2022 /KHsEMSHIYKLlizIYm/",
       "tt": 8},
     "t": [
      {"t": "definition of socialism",
       "tt": 8}]}},
  {"il":
    {"t":
      [
       {"t": "a political and economic theory ..."
        "tt": 8,
        "ln": 3}]}}]},

Moving it to the second line also makes it more clear to a reader where to
expect it.

-  EXPECT_EQ(3, first_line.text_fields()[0].num_lines());
   EXPECT_EQ(base::UTF8ToUTF16("moar text"), first_line.text_fields()[1].text());
   EXPECT_EQ(0, first_line.text_fields()[1].type());
   EXPECT_FALSE(first_line.text_fields()[1].has_num_lines());
 
   EXPECT_FALSE(first_line.additional_text());
   EXPECT_FALSE(first_line.status_text());
 
   EXPECT_TRUE(first_line.image_url().is_valid());
   EXPECT_EQ(GURL("https://example.com/foo.jpg"), first_line.image_url());
 
   const SuggestionAnswer::ImageLine& second_line = answer->second_line();
   EXPECT_EQ(1U, second_line.text_fields().size());
   EXPECT_EQ(
       base::UTF8ToUTF16("other text"), second_line.text_fields()[0].text());
   EXPECT_EQ(5, second_line.text_fields()[0].type());
+  EXPECT_TRUE(second_line.text_fields()[0].has_num_lines());
+  EXPECT_EQ(3, second_line.text_fields()[0].num_lines());
+  EXPECT_EQ(3, answer->SecondLineSize());
 
   EXPECT_TRUE(second_line.additional_text());
   EXPECT_EQ(
       base::UTF8ToUTF16("slatfatf"), second_line.additional_text()->text());
   EXPECT_EQ(42, second_line.additional_text()->type());
 
   EXPECT_TRUE(second_line.status_text());
   EXPECT_EQ(
       base::UTF8ToUTF16("oh hi, Mark"), second_line.status_text()->text());
   EXPECT_EQ(729347, second_line.status_text()->type());
@@ skipping 29 matching lines @@
       "              \"i\": { \"d\": \"//gstatic.com/foo.png\" } } }, "
       "  { \"il\": { \"t\": [{ \"t\": \"other text\", \"tt\": 8 }],"
       "              \"i\": { \"d\": \"//gstatic.com/bar.jpg\", \"t\": 3 }}}]}";
   answer = ParseAnswer(json);
   ASSERT_TRUE(answer);
   answer->AddImageURLsTo(&urls);
   ASSERT_EQ(3U, urls.size());
   EXPECT_EQ(GURL("https://gstatic.com/foo.png"), urls[1]);
   EXPECT_EQ(GURL("https://gstatic.com/bar.jpg"), urls[2]);
 }