wstrings: convert CppVariant and CppBoundClass to not use wstring

chrome/renderer/dom_ui_bindings.cc

 // Copyright (c) 2010 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/dom_ui_bindings.h"
 
 #include "base/json/json_writer.h"
 #include "base/stl_util-inl.h"
-#include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/common/render_messages.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebURL.h"
 
 DOMBoundBrowserObject::DOMBoundBrowserObject()
     : sender_(NULL),
       routing_id_(0) {
 }
 
@@ skipping 16 matching lines @@
   // Require the first parameter to be the message name.
   if (!args[0].isString())
     return;
   const std::string message = args[0].ToString();
 
   // If they've provided an optional message parameter, convert that into JSON.
   std::string content;
   if (args.size() == 2) {
     if (!args[1].isObject())
       return;
-    // TODO(evanm): we ought to support more than just sending arrays of
-    // strings, but it's not yet necessary for the current code.
-    std::vector<std::wstring> strings = args[1].ToStringVector();
+    std::vector<std::string> strings = args[1].ToStringVector();
     ListValue value;
     for (size_t i = 0; i < strings.size(); ++i) {
-      // TODO(viettrungluu): remove conversion and utf_string_conversions.h
-      value.Append(Value::CreateStringValue(WideToUTF16Hack(strings[i])));
+      value.Append(Value::CreateStringValue(strings[i]));
     }

[viettrungluu, 2010/12/03 02:00:16]

You can probably omit the braces as well. (I don't care much either way, but it
seems to be in keeping with the style in this file.)

     base::JSONWriter::Write(&value, /* pretty_print= */ false, &content);
   }
 
   // Retrieve the source frame's url
   GURL source_url;
   WebKit::WebFrame* webframe = WebKit::WebFrame::frameForCurrentContext();
   if (webframe)
     source_url = webframe->url();
 
   // Send the message up to the browser.
   sender()->Send(
       new ViewHostMsg_DOMUISend(routing_id(), source_url, message, content));
 }
 
 void DOMBoundBrowserObject::SetProperty(const std::string& name,
                                 const std::string& value) {
   CppVariant* cpp_value = new CppVariant;
   cpp_value->Set(value);
   BindProperty(name, cpp_value);
   properties_.push_back(cpp_value);
 }