[Android] Add API for specifying a charset for data Urls.

android_webview/javatests/src/org/chromium/android_webview/test/AndroidWebViewTestBase.java

Index: android_webview/javatests/src/org/chromium/android_webview/test/AndroidWebViewTestBase.java
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AndroidWebViewTestBase.java b/android_webview/javatests/src/org/chromium/android_webview/test/AndroidWebViewTestBase.java
index a4388a33a8f98488ae950fbda2502e4f55cb156f..89f477e3c6bc1162383f7d75127c8d6a23089990 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/AndroidWebViewTestBase.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/AndroidWebViewTestBase.java
@@ -170,6 +170,23 @@ public class AndroidWebViewTestBase
                 TimeUnit.SECONDS);
     }
 
+    protected void loadDataSyncWithCharset(final AwContents awContents,
+                                           CallbackHelper onPageFinishedHelper,
+                                           final String data, final String mimeType,
+                                           final boolean isBase64Encoded, final String charset)
+            throws Throwable {
+        int currentCallCount = onPageFinishedHelper.getCallCount();
+        runTestOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                awContents.loadUrl(LoadUrlParams.createLoadDataParams(
+                        data, mimeType, isBase64Encoded, charset));
+            }
+        });
+        onPageFinishedHelper.waitForCallback(currentCallCount, 1, WAIT_TIMEOUT_SECONDS,
+                TimeUnit.SECONDS);
+    }
+
     /**
      * Loads data on the UI thread but does not block.
      */