Upstream rewrite of Instant.

chrome/renderer/searchbox_extension.cc

 // Copyright (c) 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_extension.h"
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
+#include "base/string16.h"
 #include "base/string_split.h"
 #include "base/stringprintf.h"
 #include "chrome/renderer/searchbox.h"
 #include "content/public/renderer/render_view.h"
 #include "grit/renderer_resources.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebScriptSource.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "v8/include/v8.h"
@@ skipping 187 matching lines @@
 }
 
 // static
 v8::Handle<v8::Value> SearchBoxExtensionWrapper::GetValue(
     const v8::Arguments& args) {
   content::RenderView* render_view = GetRenderView();
   if (!render_view) return v8::Undefined();
   return v8::String::New(
       reinterpret_cast<const uint16_t*>(
           SearchBox::Get(render_view)->value().c_str()),
-      SearchBox::Get(render_view)->value().length());
+          SearchBox::Get(render_view)->value().length());
 }
 
 // static
 v8::Handle<v8::Value> SearchBoxExtensionWrapper::GetVerbatim(
     const v8::Arguments& args) {
   content::RenderView* render_view = GetRenderView();
   if (!render_view) return v8::Undefined();
   return v8::Boolean::New(SearchBox::Get(render_view)->verbatim());
 }
 
@@ skipping 49 matching lines @@
 // {
 //   suggestions: [
 //     {
 //       value: "..."
 //     }
 //   ]
 // }
 // static
 v8::Handle<v8::Value> SearchBoxExtensionWrapper::SetSuggestions(
     const v8::Arguments& args) {
-  std::vector<std::string> suggestions;
+  std::vector<string16> suggestions;
   InstantCompleteBehavior behavior = INSTANT_COMPLETE_NOW;
 
   if (args.Length() && args[0]->IsArray()) {
     // For backwards compatibility, also accept an array of strings.
     // TODO(tonyg): Remove this when it is confirmed to be unused.
     v8::Local<v8::Array> suggestions_array =
         v8::Local<v8::Array>::Cast(args[0]);
     uint32_t length = suggestions_array->Length();
     for (uint32_t i = 0; i < length; i++) {
-      std::string suggestion = *v8::String::Utf8Value(
-          suggestions_array->Get(v8::Integer::New(i))->ToString());
+      string16 suggestion(reinterpret_cast<char16*>(*v8::String::Value(
+          suggestions_array->Get(v8::Integer::New(i))->ToString())));
       if (!suggestion.length()) continue;
       suggestions.push_back(suggestion);
     }
   } else if (args.Length() && args[0]->IsObject()) {
     // Standard version, object argument.
     v8::Local<v8::Object> suggestion_json =
         v8::Local<v8::Object>::Cast(args[0]);
     v8::Local<v8::Value> suggestions_field =
         suggestion_json->Get(v8::String::New("suggestions"));
 
     if (suggestions_field->IsArray()) {
       v8::Local<v8::Array> suggestions_array =
           suggestions_field.As<v8::Array>();
 
       uint32_t length = suggestions_array->Length();
       for (uint32_t i = 0; i < length; i++) {
         v8::Local<v8::Value> suggestion_value =
             suggestions_array->Get(v8::Integer::New(i));
         if (!suggestion_value->IsObject()) continue;
 
         v8::Local<v8::Object> suggestion_object =
             suggestion_value.As<v8::Object>();
         v8::Local<v8::Value> suggestion_object_value =
             suggestion_object->Get(v8::String::New("value"));
         if (!suggestion_object_value->IsString()) continue;
 
-        std::string suggestion = *v8::String::Utf8Value(
-            suggestion_object_value->ToString());
+        string16 suggestion(reinterpret_cast<char16*>(*v8::String::Value(
+            suggestion_object_value->ToString())));
         if (!suggestion.length()) continue;
         suggestions.push_back(suggestion);
       }
     }
     if (suggestion_json->Has(v8::String::New("complete_behavior"))) {
       v8::Local<v8::Value> complete_value =
           suggestion_json->Get(v8::String::New("complete_behavior"));
       if (complete_value->IsString()) {
         if (complete_value->Equals(v8::String::New("never")))
           behavior = INSTANT_COMPLETE_NEVER;
@@ skipping 69 matching lines @@
 
 // static
 v8::Extension* SearchBoxExtension::Get() {
   const base::StringPiece code =
       ResourceBundle::GetSharedInstance().GetRawDataResource(
           IDR_SEARCHBOX_API, ui::SCALE_FACTOR_NONE);
   return new SearchBoxExtensionWrapper(code);
 }
 
 }  // namespace extensions_v8