wstrings: convert CppVariant and CppBoundClass to not use wstring

webkit/glue/cpp_variant.cc

 // Copyright (c) 2006-2008 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.
 
 // This file contains definitions for CppVariant.
 
 #include <limits>
 #include "third_party/WebKit/WebKit/chromium/public/WebBindings.h"
 #include "webkit/glue/cpp_variant.h"
 #include "base/logging.h"
@@ skipping 193 matching lines @@
     NOTREACHED();
     return 0.0;
   }
 }
 
 bool CppVariant::ToBoolean() const {
   DCHECK(isBool());
   return value.boolValue;
 }
 
-std::vector<std::wstring> CppVariant::ToStringVector() const {
-
+std::vector<std::string> CppVariant::ToStringVector() const {
   DCHECK(isObject());
-  std::vector<std::wstring> wstring_vector;
+  std::vector<std::string> string_vector;
   NPObject* np_value = value.objectValue;
   NPIdentifier length_id = WebBindings::getStringIdentifier("length");
 
   if (WebBindings::hasProperty(NULL, np_value, length_id)) {
     NPVariant length_value;
     if (WebBindings::getProperty(NULL, np_value, length_id, &length_value)) {
       int length = 0;
       // The length is a double in some cases.
       if (NPVARIANT_IS_DOUBLE(length_value))
         length = static_cast<int>(NPVARIANT_TO_DOUBLE(length_value));
       else if (NPVARIANT_IS_INT32(length_value))
         length = NPVARIANT_TO_INT32(length_value);
       WebBindings::releaseVariantValue(&length_value);
 
       // For sanity, only allow 60000 items.
       length = std::min(60000, length);
       for (int i = 0; i < length; ++i) {
         // Get each of the items.
         std::string index = base::StringPrintf("%d", i);
         NPIdentifier index_id = WebBindings::getStringIdentifier(index.c_str());
         if (WebBindings::hasProperty(NULL, np_value, index_id)) {
           NPVariant index_value;
           if (WebBindings::getProperty(NULL, np_value, index_id, &index_value)) {
             if (NPVARIANT_IS_STRING(index_value)) {
               std::string string(
                   NPVARIANT_TO_STRING(index_value).UTF8Characters,
                   NPVARIANT_TO_STRING(index_value).UTF8Length);
-              wstring_vector.push_back(UTF8ToWide(string));
+              string_vector.push_back(string);

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

Reading the code, I suppose it's clear that this is at least as right as what we
used to have.

             }
             WebBindings::releaseVariantValue(&index_value);
           }
         }
       }
     }
   }
-  return wstring_vector;
+  return string_vector;
 }
 
 bool CppVariant::Invoke(const std::string& method, const CppVariant* args,
                         uint32 arg_count, CppVariant& result) const {
   DCHECK(isObject());
   NPIdentifier method_name = WebBindings::getStringIdentifier(method.c_str());
   NPObject* np_object = value.objectValue;
   if (WebBindings::hasMethod(NULL, np_object, method_name)) {
     NPVariant r;
     bool status = WebBindings::invoke(NULL, np_object, method_name, args, arg_count, &r);
     result.Set(r);
     return status;
   } else {
     return false;
   }
 }