Add a class to parse answer json.

components/omnibox/autocomplete_match.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/autocomplete_match.h"
 
 #include "base/i18n/time_formatting.h"
 #include "base/logging.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "components/omnibox/autocomplete_provider.h"
+#include "components/omnibox/suggestion_answer.h"
 #include "components/search_engines/template_url.h"
 #include "components/search_engines/template_url_service.h"
 #include "grit/components_scaled_resources.h"
 
 namespace {
 
 bool IsTrivialClassification(const ACMatchClassifications& classifications) {
   return classifications.empty() ||
       ((classifications.size() == 1) &&
        (classifications.back().style == ACMatchClassification::NONE));
@@ skipping 47 matching lines @@
       inline_autocompletion(match.inline_autocompletion),
       allowed_to_be_default_match(match.allowed_to_be_default_match),
       destination_url(match.destination_url),
       stripped_destination_url(match.stripped_destination_url),
       contents(match.contents),
       contents_class(match.contents_class),
       description(match.description),
       description_class(match.description_class),
       answer_contents(match.answer_contents),
       answer_type(match.answer_type),
+      answer(match.answer.get() ? new SuggestionAnswer(*match.answer) : NULL),

[groby-ooo-7-16, 2014/10/21 00:35:54]

UGH. I forgot that AutocompleteMatch can be copy-constructed. That probably
means we should refcount it, if we really care about savings. (Which opens
another can of worms...)

[Justin Donnelly, 2014/10/21 21:43:54]

Yes, I agree that option #2 is probably the right answer (always having a value
for the answer object).  It seems undesirable to have the overhead but the
reality is we're talking about dozens of suggestion and match objects, not
thousands.

I've made the change to eliminate the scoped_ptrs and the new copy constructor
and assignment operator.  The code is much nicer now.  Let me know what you
think.

       transition(match.transition),
       is_history_what_you_typed_match(match.is_history_what_you_typed_match),
       type(match.type),
       associated_keyword(match.associated_keyword.get() ?
           new AutocompleteMatch(*match.associated_keyword) : NULL),
       keyword(match.keyword),
       from_previous(match.from_previous),
       search_terms_args(match.search_terms_args.get() ?
           new TemplateURLRef::SearchTermsArgs(*match.search_terms_args) :
           NULL),
@@ skipping 17 matching lines @@
   inline_autocompletion = match.inline_autocompletion;
   allowed_to_be_default_match = match.allowed_to_be_default_match;
   destination_url = match.destination_url;
   stripped_destination_url = match.stripped_destination_url;
   contents = match.contents;
   contents_class = match.contents_class;
   description = match.description;
   description_class = match.description_class;
   answer_contents = match.answer_contents;
   answer_type = match.answer_type;
+  answer.reset(match.answer.get() ? new SuggestionAnswer(*match.answer) : NULL);
   transition = match.transition;
   is_history_what_you_typed_match = match.is_history_what_you_typed_match;
   type = match.type;
   associated_keyword.reset(match.associated_keyword.get() ?
       new AutocompleteMatch(*match.associated_keyword) : NULL);
   keyword = match.keyword;
   from_previous = match.from_previous;
   search_terms_args.reset(match.search_terms_args.get() ?
       new TemplateURLRef::SearchTermsArgs(*match.search_terms_args) : NULL);
   additional_info = match.additional_info;
@@ skipping 405 matching lines @@
         << " is unsorted in relation to last offset of " << last_offset
         << ". Provider: " << provider_name << ".";
     DCHECK_LT(i->offset, text.length())
         << " Classification of [" << i->offset << "," << text.length()
         << "] is out of bounds for \"" << text << "\". Provider: "
         << provider_name << ".";
     last_offset = i->offset;
   }
 }
 #endif