| Index: content/renderer/render_view_impl.cc
|
| diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
|
| index a20ef4d509906ad6416e2038fe64c3a89545c9dc..8f715bb6e44a99ced99116e2c1c7f9264fed24d9 100644
|
| --- a/content/renderer/render_view_impl.cc
|
| +++ b/content/renderer/render_view_impl.cc
|
| @@ -950,7 +950,7 @@ void RenderView::ApplyWebPreferences(const WebPreferences& prefs,
|
| settings->setMinimumFontSize(prefs.minimum_font_size);
|
| settings->setMinimumLogicalFontSize(prefs.minimum_logical_font_size);
|
| settings->setDefaultTextEncodingName(
|
| - base::ASCIIToUTF16(prefs.default_encoding));
|
| + WebString::fromASCII(prefs.default_encoding));
|
| settings->setJavaScriptEnabled(prefs.javascript_enabled);
|
| settings->setWebSecurityEnabled(prefs.web_security_enabled);
|
| settings->setJavaScriptCanOpenWindowsAutomatically(
|
| @@ -1112,7 +1112,7 @@ void RenderView::ApplyWebPreferences(const WebPreferences& prefs,
|
| settings->setMediaPlaybackRequiresUserGesture(
|
| prefs.user_gesture_required_for_media_playback);
|
| settings->setDefaultVideoPosterURL(
|
| - base::ASCIIToUTF16(prefs.default_video_poster_url.spec()));
|
| + WebString::fromASCII(prefs.default_video_poster_url.spec()));
|
| settings->setSupportDeprecatedTargetDensityDPI(
|
| prefs.support_deprecated_target_density_dpi);
|
| settings->setUseLegacyBackgroundSizeShorthandBehavior(
|
|
|