Change InstantAutocompleteResult::Type to be AutocompleteMatchType::Type.

chrome/browser/ui/search/instant_controller.cc

 // Copyright 2012 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 "chrome/browser/ui/search/instant_controller.h"
 
 #include <iterator>
 
 #include "base/metrics/histogram.h"
 #include "base/string_util.h"
@@ skipping 1805 matching lines @@
   // TODO(dcblack): Remove extraneous history entry caused by 404s.
   // Note that the base case of a 204 being returned doesn't push a history
   // entry.
 }
 
 void InstantController::PopulateInstantAutocompleteResultFromMatch(
     const AutocompleteMatch& match, size_t autocomplete_match_index,
     InstantAutocompleteResult* result) {
   DCHECK(result);
   result->provider = UTF8ToUTF16(match.provider->GetName());
-  result->type = UTF8ToUTF16(AutocompleteMatchType::ToString(match.type));
+  result->type = match.type;
   result->description = match.description;
   result->destination_url = UTF8ToUTF16(match.destination_url.spec());
 
   // Setting the search_query field tells the Instant page to treat the
   // suggestion as a query.
   if (AutocompleteMatch::IsSearchType(match.type))
     result->search_query = match.contents;
 
   result->transition = match.transition;
   result->relevance = match.relevance;
   result->autocomplete_match_index = autocomplete_match_index;
 
-  DVLOG(1) << "    " << result->relevance << " " << result->type << " "
+  DVLOG(1) << "    " << result->relevance << " "
+      << UTF8ToUTF16(AutocompleteMatchType::ToString(result->type)) << " "
       << result->provider << " " << result->destination_url << " '"
       << result->description << "' '" << result->search_query << "' "
       << result->transition <<  " " << result->autocomplete_match_index;
 }