Convert std::wstring encoding names to std::string in a bunch of files.

webkit/tools/test_shell/layout_test_controller.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 the definition for LayoutTestController.
 
 #include <vector>
 
 #include "webkit/tools/test_shell/layout_test_controller.h"
 
@@ skipping 876 matching lines @@
       preferences->fantasy_font_family = CppVariantToWstring(value);
     else if (key == "WebKitDefaultFontSize")
       preferences->default_font_size = CppVariantToInt32(value);
     else if (key == "WebKitDefaultFixedFontSize")
       preferences->default_fixed_font_size = CppVariantToInt32(value);
     else if (key == "WebKitMinimumFontSize")
       preferences->minimum_font_size = CppVariantToInt32(value);
     else if (key == "WebKitMinimumLogicalFontSize")
       preferences->minimum_logical_font_size = CppVariantToInt32(value);
     else if (key == "WebKitDefaultTextEncodingName")
-      preferences->default_encoding = CppVariantToWstring(value);
+      preferences->default_encoding = value.ToString();
     else if (key == "WebKitJavaScriptEnabled")
       preferences->javascript_enabled = CppVariantToBool(value);
     else if (key == "WebKitWebSecurityEnabled")
       preferences->web_security_enabled = CppVariantToBool(value);
     else if (key == "WebKitJavaScriptCanOpenWindowsAutomatically")
       preferences->javascript_can_open_windows_automatically =
           CppVariantToBool(value);
     else if (key == "WebKitDisplayImagesKey")
       preferences->loads_images_automatically = CppVariantToBool(value);
     else if (key == "WebKitPluginsEnabled")
@@ skipping 47 matching lines @@
 
   WebKit::WebURL url(GURL(args[0].ToString()));
   if (!url.isValid())
     return;
 
   WebKit::whiteListAccessFromOrigin(url,
                                     WebString::fromUTF8(args[1].ToString()),
                                     WebString::fromUTF8(args[2].ToString()),
                                     args[3].ToBoolean());
 }