Convert ReplaceStringPlaceholders(std::string...) to take a

chrome/renderer/extensions/extension_process_bindings.cc

 // Copyright (c) 2009 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/extensions/extension_process_bindings.h"
 
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 307 matching lines @@
 
     L10nMessagesMap* l10n_messages =
       GetL10nMessagesMap(ExtensionIdForCurrentContext());
     if (!l10n_messages)
       return v8::Undefined();
 
     std::string message_name = *v8::String::AsciiValue(args[0]);
     std::string message =
       ExtensionMessageBundle::GetL10nMessage(message_name, *l10n_messages);
 
-    std::vector<string16> substitutions;
+    std::vector<std::string> substitutions;
     if (args[1]->IsNull() || args[1]->IsUndefined()) {
       // chrome.i18n.getMessage("message_name");
       // chrome.i18n.getMessage("message_name", null);
       return v8::String::New(message.c_str());
     } else if (args[1]->IsString()) {
       // chrome.i18n.getMessage("message_name", "one param");
       std::string substitute = *v8::String::Utf8Value(args[1]->ToString());
-      substitutions.push_back(UTF8ToUTF16(substitute));
+      substitutions.push_back(substitute);
     } else if (args[1]->IsArray()) {
       // chrome.i18n.getMessage("message_name", ["more", "params"]);
       v8::Array* placeholders = static_cast<v8::Array*>(*args[1]);
       uint32_t count = placeholders->Length();
       DCHECK(count > 0 && count <= 9);
       for (uint32_t i = 0; i < count; ++i) {
         std::string substitute =
           *v8::String::Utf8Value(
               placeholders->Get(v8::Integer::New(i))->ToString());
-        substitutions.push_back(UTF8ToUTF16(substitute));
+        substitutions.push_back(substitute);
       }
     } else {
       NOTREACHED() << "Couldn't parse second parameter.";
       return v8::Undefined();
     }
 
-    return v8::String::New(UTF16ToUTF8(ReplaceStringPlaceholders(
-        UTF8ToUTF16(message), substitutions, NULL)).c_str());
+    return v8::String::New(ReplaceStringPlaceholders(
+        message, substitutions, NULL).c_str());
   }
 
   // Common code for starting an API request to the browser. |value_args|
   // contains the request's arguments.
   static v8::Handle<v8::Value> StartRequestCommon(
       const v8::Arguments& args, Value* value_args) {
     // Get the current RenderView so that we can send a routed IPC message from
     // the correct source.
     RenderView* renderview = bindings_utils::GetRenderViewForCurrentContext();
     if (!renderview)
@@ skipping 245 matching lines @@
     return;
 
   v8::HandleScope handle_scope;
   WebFrame* frame = view->mainFrame();
   v8::Local<v8::Context> context = frame->mainWorldScriptContext();
   v8::Handle<v8::Value> argv[1];
   argv[0] = v8::String::New(type_str);
   bindings_utils::CallFunctionInContext(context, "setViewType",
                                         arraysize(argv), argv);
 }