Upstream rewrite of Instant.

chrome/renderer/search_extension.cc

 // Copyright (c) 2011 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/search_extension.h"
 
-#include <string>
 #include <vector>
 
 #include "base/command_line.h"
+#include "base/string16.h"
 #include "chrome/renderer/searchbox.h"
 #include "content/public/renderer/render_view.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 #include "v8/include/v8.h"
 
 using WebKit::WebFrame;
 using WebKit::WebView;
 
 namespace extensions_v8 {
 
@@ skipping 52 matching lines @@
 }
 
 // static
 v8::Handle<v8::Value> SearchExtensionWrapper::SetSuggestResult(
     const v8::Arguments& args) {
   if (!args.Length() || !args[0]->IsString()) return v8::Undefined();
 
   content::RenderView* render_view = GetRenderView();
   if (!render_view) return v8::Undefined();
 
-  std::vector<std::string> suggestions;
-  suggestions.push_back(std::string(*v8::String::Utf8Value(args[0])));
+  std::vector<string16> suggestions;
+  suggestions.push_back(string16(reinterpret_cast<char16*>(
+      *v8::String::Value(args[0]))));
   SearchBox::Get(render_view)->SetSuggestions(suggestions,
                                               INSTANT_COMPLETE_NOW);
   return v8::Undefined();
 }
 
 v8::Extension* SearchExtension::Get() {
   return new SearchExtensionWrapper();
 }
 
 }  // namespace extensions_v8