commit 53dc1aa95198e9cf7020ec848f3b27cbee50b35e
author Marcin Kosiba <mkosiba@google.com> Fri Oct 10 17:19:17 2014 +0100
committer Marcin Kosiba <mkosiba@google.com> Fri Oct 10 17:19:17 2014 +0100
tree 506d9bbdff997e5e1c9624482c286418e6e73348
parent 0c6c259ab3445e03276d3013c4a7daefb26002bc

Match removal of config_webSettingsDefaultTextEncoding.

This is to match http://ag/565166 which removes the resource.

Change-Id: Id064af59410ac5d031af0c26817a5a15ea320906

chromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java

diff --git a/chromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java b/chromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
index aa6ed75..f8fc59f 100644
--- a/chromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
+++ b/chromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
@@ -310,8 +310,6 @@
         AwResource.setResources(ctx.getResources());
         AwResource.setErrorPageResources(android.R.raw.loaderror,
                 android.R.raw.nodomain);
-        AwResource.setDefaultTextEncoding(
-                android.R.string.config_webSettingsDefaultTextEncoding);
         AwResource.setConfigKeySystemUuidMapping(
                 android.R.array.config_keySystemUuidMapping);
     }