Factor parsing "ln=" to SuggestionAnswer

components/omnibox/browser/suggestion_answer.h

 // 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.
 
 #ifndef COMPONENTS_OMNIBOX_BROWSER_SUGGESTION_ANSWER_H_
 #define COMPONENTS_OMNIBOX_BROWSER_SUGGESTION_ANSWER_H_
 
 #include <memory>
 #include <string>
 #include <vector>
@@ skipping 90 matching lines @@
     // Parses |line_json| and populates |image_line| with the contents.  If any
     // of the required elements is missing, returns false and leaves text_field
     // in a partially populated state.
     static bool ParseImageLine(const base::DictionaryValue* line_json,
                                ImageLine* image_line);
 
     const TextFields& text_fields() const { return text_fields_; }
     const TextField* additional_text() const { return additional_text_.get(); }
     const TextField* status_text() const { return status_text_.get(); }
     const GURL& image_url() const { return image_url_; }
+    int num_text_lines() const { return num_text_lines_; }

[Peter Kasting, 2016/06/29 23:08:57]

Nit: Make accessor order and member declaration order below match

[Kevin Bailey, 2016/06/30 13:19:29]

Made this one match rest of CL.

 
     bool Equals(const ImageLine& line) const;
 
     // Returns a string appropriate for use as a readable representation of the
     // content of this line.
     base::string16 AccessibleText() const;
 
    private:
     // Forbid assignment.
     ImageLine& operator=(const ImageLine&);
 
     TextFields text_fields_;
+    int num_text_lines_;
     std::unique_ptr<TextField> additional_text_;
     std::unique_ptr<TextField> status_text_;
     GURL image_url_;
 
     FRIEND_TEST_ALL_PREFIXES(SuggestionAnswerTest, DifferentValuesAreUnequal);
   };
 
   SuggestionAnswer();
-  SuggestionAnswer(const SuggestionAnswer& answer);
+  SuggestionAnswer(const SuggestionAnswer& answer) = default;
   ~SuggestionAnswer();
 
   // Parses |answer_json| and returns a SuggestionAnswer containing the
   // contents.  If the supplied data is not well formed or is missing required
   // elements, returns nullptr instead.
   static std::unique_ptr<SuggestionAnswer> ParseAnswer(
       const base::DictionaryValue* answer_json);
 
   // TODO(jdonnelly): Once something like std::optional<T> is available in base/
   // (see discussion at http://goo.gl/zN2GNy) remove this in favor of having
@@ skipping 21 matching lines @@
   SuggestionAnswer& operator=(const SuggestionAnswer&);
 
   ImageLine first_line_;
   ImageLine second_line_;
   int type_;
 
   FRIEND_TEST_ALL_PREFIXES(SuggestionAnswerTest, DifferentValuesAreUnequal);
 };
 
 #endif  // COMPONENTS_OMNIBOX_BROWSER_SUGGESTION_ANSWER_H_