diff options
Diffstat (limited to 'webkit/tools/test_shell')
| -rw-r--r-- | webkit/tools/test_shell/layout_test_controller.cc | 2 | ||||
| -rw-r--r-- | webkit/tools/test_shell/test_shell.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/webkit/tools/test_shell/layout_test_controller.cc b/webkit/tools/test_shell/layout_test_controller.cc index be19c95..fbfda9f 100644 --- a/webkit/tools/test_shell/layout_test_controller.cc +++ b/webkit/tools/test_shell/layout_test_controller.cc @@ -894,7 +894,7 @@ void LayoutTestController::overridePreference( 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") diff --git a/webkit/tools/test_shell/test_shell.cc b/webkit/tools/test_shell/test_shell.cc index 317a746..3ebb1bc 100644 --- a/webkit/tools/test_shell/test_shell.cc +++ b/webkit/tools/test_shell/test_shell.cc @@ -402,7 +402,7 @@ void TestShell::ResetWebPreferences() { web_prefs_->fixed_font_family = L"Courier"; web_prefs_->sans_serif_font_family = L"Helvetica"; - web_prefs_->default_encoding = L"ISO-8859-1"; + web_prefs_->default_encoding = "ISO-8859-1"; web_prefs_->default_font_size = 16; web_prefs_->default_fixed_font_size = 13; web_prefs_->minimum_font_size = 1; |