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

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

 // Copyright (c) 2012 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.
 
 package org.chromium.android_webview.test;
 
 import android.app.Instrumentation;
 import android.content.Context;
 import android.test.ActivityInstrumentationTestCase2;
 
@@ skipping 152 matching lines @@
     protected void loadDataSync(final AwContents awContents,
                                 CallbackHelper onPageFinishedHelper,
                                 final String data, final String mimeType,
                                 final boolean isBase64Encoded) throws Throwable {
         int currentCallCount = onPageFinishedHelper.getCallCount();
         loadDataAsync(awContents, data, mimeType, isBase64Encoded);
         onPageFinishedHelper.waitForCallback(currentCallCount, 1, WAIT_TIMEOUT_SECONDS,
                 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.
      */
     protected void loadDataAsync(final AwContents awContents, final String data,
                                  final String mimeType, final boolean isBase64Encoded)
             throws Throwable {
         runTestOnUiThread(new Runnable() {
             @Override
             public void run() {
                 awContents.loadUrl(LoadUrlParams.createLoadDataParams(
@@ skipping 115 matching lines @@
             final AwContents awContents,
             final boolean includeDiskFiles) throws Throwable {
         runTestOnUiThread(new Runnable() {
             @Override
             public void run() {
               awContents.clearCache(includeDiskFiles);
             }
         });
     }
 }