diff options
| author | leandrogracia@chromium.org <leandrogracia@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-05 15:07:42 +0000 |
|---|---|---|
| committer | leandrogracia@chromium.org <leandrogracia@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-05 15:07:42 +0000 |
| commit | 37f50bc2a6f50498c811e32c6b651dd2b1b7dd3c (patch) | |
| tree | f4dd2f84c45035ee3a35dfec15fa9596db146d74 /android_webview/java | |
| parent | 6023221cad72ef2de70c4714d9b1a32d79ba41c9 (diff) | |
| download | chromium_src-37f50bc2a6f50498c811e32c6b651dd2b1b7dd3c.zip chromium_src-37f50bc2a6f50498c811e32c6b651dd2b1b7dd3c.tar.gz chromium_src-37f50bc2a6f50498c811e32c6b651dd2b1b7dd3c.tar.bz2 | |
[Android] Upstream WebView tests and their dependencies.
These are most of the WebView tests that are pending to be upstreamed. Any references to UrlUtils.getTestHttpUrl had to be migrated to alternative approaches. In order to make the tests work as closest as possible to their originals, we have decided to use TestWebServer whenever possible instead of accessing the files directly to prevent any possible subtle issues related to file:// access. This means that most tests will define their own resources within themselves.
Also, some bits of non-WebView code needed to be upstreamed in order to get some of the tests building and passing.
BUG=none
Review URL: https://chromiumcodereview.appspot.com/11026044
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@160373 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview/java')
| -rw-r--r-- | android_webview/java/src/org/chromium/android_webview/AwContents.java | 6 | ||||
| -rw-r--r-- | android_webview/java/src/org/chromium/android_webview/ErrorCodeConversionHelper.java | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/android_webview/java/src/org/chromium/android_webview/AwContents.java b/android_webview/java/src/org/chromium/android_webview/AwContents.java index dd337a2..67848b05 100644 --- a/android_webview/java/src/org/chromium/android_webview/AwContents.java +++ b/android_webview/java/src/org/chromium/android_webview/AwContents.java @@ -4,6 +4,7 @@ package org.chromium.android_webview; +import android.graphics.Bitmap; import android.net.http.SslCertificate; import android.os.AsyncTask; import android.os.Message; @@ -152,6 +153,11 @@ public class AwContents { return mContentsClient.getWebContentsDelegate().getMostRecentProgress(); } + public Bitmap getFavicon() { + // To be implemented. + return null; + } + //-------------------------------------------------------------------------------------------- // WebView[Provider] method implementations (where not provided by ContentViewCore) //-------------------------------------------------------------------------------------------- diff --git a/android_webview/java/src/org/chromium/android_webview/ErrorCodeConversionHelper.java b/android_webview/java/src/org/chromium/android_webview/ErrorCodeConversionHelper.java index 903927e..9b4d377a 100644 --- a/android_webview/java/src/org/chromium/android_webview/ErrorCodeConversionHelper.java +++ b/android_webview/java/src/org/chromium/android_webview/ErrorCodeConversionHelper.java @@ -9,7 +9,7 @@ import org.chromium.net.NetError; /** * This is a helper class to map native error code about loading a page to Android specific ones. */ -class ErrorCodeConversionHelper { +public abstract class ErrorCodeConversionHelper { // Success public static final int ERROR_OK = 0; // Generic error |