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

webkit/glue/webpreferences.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 "webkit/glue/webpreferences.h"
 
 #include "base/string_util.h"
 #include "webkit/api/public/WebKit.h"
 #include "webkit/api/public/WebSettings.h"
 #include "webkit/api/public/WebString.h"
 #include "webkit/api/public/WebURL.h"
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/glue/webview.h"
 
 using WebKit::WebSettings;
 using WebKit::WebURL;
 
 void WebPreferences::Apply(WebView* web_view) const {
   WebSettings* settings = web_view->GetSettings();
   settings->setStandardFontFamily(WideToUTF16Hack(standard_font_family));
   settings->setFixedFontFamily(WideToUTF16Hack(fixed_font_family));
   settings->setSerifFontFamily(WideToUTF16Hack(serif_font_family));
   settings->setSansSerifFontFamily(WideToUTF16Hack(sans_serif_font_family));
   settings->setCursiveFontFamily(WideToUTF16Hack(cursive_font_family));
   settings->setFantasyFontFamily(WideToUTF16Hack(fantasy_font_family));
   settings->setDefaultFontSize(default_font_size);
   settings->setDefaultFixedFontSize(default_fixed_font_size);
   settings->setMinimumFontSize(minimum_font_size);
   settings->setMinimumLogicalFontSize(minimum_logical_font_size);
-  settings->setDefaultTextEncodingName(WideToUTF16Hack(default_encoding));
+  settings->setDefaultTextEncodingName(ASCIIToUTF16(default_encoding));
   settings->setJavaScriptEnabled(javascript_enabled);
   settings->setWebSecurityEnabled(web_security_enabled);
   settings->setJavaScriptCanOpenWindowsAutomatically(
       javascript_can_open_windows_automatically);
   settings->setLoadsImagesAutomatically(loads_images_automatically);
   settings->setPluginsEnabled(plugins_enabled);
   settings->setDOMPasteAllowed(dom_paste_enabled);
   settings->setDeveloperExtrasEnabled(developer_extras_enabled);
   settings->setShrinksStandaloneImagesToFit(shrinks_standalone_images_to_fit);
   settings->setUsesEncodingDetector(uses_universal_detector);
@@ skipping 28 matching lines @@
   settings->setAllowUniversalAccessFromFileURLs(false);
 
   // We prevent WebKit from checking if it needs to add a "text direction"
   // submenu to a context menu. it is not only because we don't need the result
   // but also because it cause a possible crash in Editor::hasBidiSelection().
   settings->setTextDirectionSubmenuInclusionBehaviorNeverIncluded();
 
   // Web inspector settings need to be passed in differently.
   web_view->SetInspectorSettings(inspector_settings);
 }