Don't set suggestion type to SEARCH_SUGGEST_ANSWER on search responses with Answers attached

components/omnibox/search_suggestion_parser.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/search_suggestion_parser.h"
 
 #include "base/i18n/icu_string_conversions.h"
 #include "base/json/json_string_value_serializer.h"
 #include "base/json/json_writer.h"
 #include "base/logging.h"
@@ skipping 482 matching lines @@
 
           // Extract the Answer, if provided.
           const base::DictionaryValue* answer_json = NULL;
           if (suggestion_detail->GetDictionary("ansa", &answer_json) &&
               suggestion_detail->GetString("ansb", &answer_type_str)) {
             bool answer_parsed_successfully = false;
             answer = SuggestionAnswer::ParseAnswer(answer_json);
             int answer_type = 0;
             if (answer && base::StringToInt(answer_type_str, &answer_type)) {
               answer_parsed_successfully = true;
-              match_type = AutocompleteMatchType::SEARCH_SUGGEST_ANSWER;
 
               answer->set_type(answer_type);
               answer->AddImageURLsTo(&results->answers_image_urls);
 
               std::string contents;
               base::JSONWriter::Write(answer_json, &contents);
               answer_contents = base::UTF8ToUTF16(contents);
             } else {
               answer_type_str = base::string16();
             }
             UMA_HISTOGRAM_BOOLEAN("Omnibox.AnswerParseSuccess",
                                   answer_parsed_successfully);
           }
         }
       }
 
       bool should_prefetch = static_cast<int>(index) == prefetch_index;
       // TODO(kochi): Improve calculator suggestion presentation.
       results->suggest_results.push_back(SuggestResult(
           base::CollapseWhitespace(suggestion, false), match_type,
           base::CollapseWhitespace(match_contents, false),
           match_contents_prefix, annotation, answer_contents, answer_type_str,
           answer.Pass(), suggest_query_params, deletion_url, is_keyword_result,
           relevance, relevances != NULL, should_prefetch, trimmed_input));
     }
   }
   results->relevances_from_server = relevances != NULL;
   return true;
 }