Upstream rewrite of Instant.

chrome/renderer/search_extension.cc

Index: chrome/renderer/search_extension.cc
diff --git a/chrome/renderer/search_extension.cc b/chrome/renderer/search_extension.cc
index 01e3a7d7dbe826cc5f37b8c641716f3d53a586d0..0fa4ab03261eb9da921583aeb58cf4833d98de0d 100644
--- a/chrome/renderer/search_extension.cc
+++ b/chrome/renderer/search_extension.cc
@@ -4,10 +4,10 @@
 
 #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"
@@ -80,8 +80,9 @@ v8::Handle<v8::Value> SearchExtensionWrapper::SetSuggestResult(
   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();