Tidy up usage of URLUtil constants

Several of these are duplicated; referring to a single source makes the code
paths using them easier to track down.
(also removing a spurious import)

Bug: 6237833

Change-Id: Ibdacc124c047e37c7f0ced9ecc6f26ae3e6b4326

1 files changed, 3 insertions, 10 deletions

diff --git a/core/java/android/webkit/BrowserFrame.java b/core/java/android/webkit/BrowserFrame.java
index 72af251fe05a..7b6b54cce0cf 100644
--- a/core/java/android/webkit/BrowserFrame.java
+++ b/core/java/android/webkit/BrowserFrame.java
@@ -692,13 +692,10 @@ class BrowserFrame extends Handler {
      * @return An InputStream to the android resource
      */
     private InputStream inputStreamForAndroidResource(String url) {
-        // This list needs to be kept in sync with the list in
-        // external/webkit/WebKit/android/WebCoreSupport/WebUrlLoaderClient.cpp
-        final String ANDROID_ASSET = "file:///android_asset/";
-        final String ANDROID_RESOURCE = "file:///android_res/";
-        final String ANDROID_CONTENT = "content:";
+        final String ANDROID_ASSET = URLUtil.ASSET_BASE;
+        final String ANDROID_RESOURCE = URLUtil.RESOURCE_BASE;
+        final String ANDROID_CONTENT = URLUtil.CONTENT_BASE;
 
-        // file:///android_res
         if (url.startsWith(ANDROID_RESOURCE)) {
             url = url.replaceFirst(ANDROID_RESOURCE, "");
             if (url == null || url.length() == 0) {
@@ -736,8 +733,6 @@ class BrowserFrame extends Handler {
                 Log.e(LOGTAG, "Exception: " + url);
                 return null;
             }
-
-        // file:///android_asset
         } else if (url.startsWith(ANDROID_ASSET)) {
             url = url.replaceFirst(ANDROID_ASSET, "");
             try {
@@ -747,8 +742,6 @@ class BrowserFrame extends Handler {
             } catch (IOException e) {
                 return null;
             }
-
-        // content://
         } else if (mSettings.getAllowContentAccess() &&
                    url.startsWith(ANDROID_CONTENT)) {
             try {