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

chrome/renderer/searchbox/searchbox_extension.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/renderer/searchbox/searchbox_extension.h"
 
 #include "base/i18n/rtl.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
+#include "chrome/common/autocomplete_match_type.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/instant_types.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/renderer/searchbox/searchbox.h"
 #include "content/public/renderer/render_view.h"
 #include "googleurl/src/gurl.h"
 #include "grit/renderer_resources.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebURLRequest.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
@@ skipping 114 matching lines @@
 
 // Populates a Javascript NativeSuggestions object from |result|.
 // NOTE: Includes properties like "contents" which should be erased before the
 // suggestion is returned to the Instant page.
 v8::Handle<v8::Object> GenerateNativeSuggestion(
     const string16& query,
     InstantRestrictedID restricted_id,
     const InstantAutocompleteResult& result) {
   v8::Handle<v8::Object> obj = v8::Object::New();
   obj->Set(v8::String::New("provider"), UTF16ToV8String(result.provider));
-  obj->Set(v8::String::New("type"), UTF16ToV8String(result.type));
+  obj->Set(v8::String::New("type"),
+           UTF8ToV8String(AutocompleteMatchType::ToString(result.type)));
   obj->Set(v8::String::New("description"), UTF16ToV8String(result.description));
   obj->Set(v8::String::New("destination_url"),
            UTF16ToV8String(result.destination_url));
   if (result.search_query.empty()) {
     string16 url = result.destination_url;
     FormatURLForDisplay(&url, query);
     obj->Set(v8::String::New("contents"), UTF16ToV8String(url));
   } else {
     obj->Set(v8::String::New("contents"), UTF16ToV8String(result.search_query));
     obj->Set(v8::String::New("is_search"), v8::Boolean::New(true));
@@ skipping 1295 matching lines @@
     WebKit::WebFrame* frame) {
   Dispatch(frame, kDispatchMostVisitedChangedScript);
 }
 
 // static
 void SearchBoxExtension::DispatchBarsHidden(WebKit::WebFrame* frame) {
   Dispatch(frame, kDispatchBarsHiddenEventScript);
 }
 
 }  // namespace extensions_v8