[Android WebView] Add AwResource.setResources() and setErrorPageResources().

This is part 1 of a two-sided patch to get rid of public static fields
in AwResource.java.

R=mnaganov@chromium.org

Review URL: https://codereview.chromium.org/155653003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@249505 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 22 insertions, 6 deletions

diff --git a/android_webview/java/src/org/chromium/android_webview/AwResource.java b/android_webview/java/src/org/chromium/android_webview/AwResource.java
index 829f243..7051acbc 100644
--- a/android_webview/java/src/org/chromium/android_webview/AwResource.java
+++ b/android_webview/java/src/org/chromium/android_webview/AwResource.java
@@ -17,6 +17,10 @@ import java.util.Map;
 import java.util.NoSuchElementException;
 import java.util.Scanner;
 
+/**
+ * A class that defines a set of resource IDs and functionality to resolve
+ * those IDs to concrete resources.
+ */
 @JNINamespace("android_webview::AwResource")
 public class AwResource {
     // The following resource ID's must be initialized by the embedder.
@@ -47,6 +51,15 @@ public class AwResource {
         sResourceCache = new HashMap<Integer, SoftReference<String> >();
     }
 
+    public static void setErrorPageResources(int loaderror, int nodomain) {
+        RAW_LOAD_ERROR = loaderror;
+        RAW_NO_DOMAIN = nodomain;
+    }
+
+    public static void setDefaultTextEncoding(int encoding) {
+        STRING_DEFAULT_TEXT_ENCODING = encoding;
+    }
+
     @CalledByNative
     public static String getDefaultTextEncoding() {
         return getResource(STRING_DEFAULT_TEXT_ENCODING, TYPE_STRING);
@@ -109,6 +122,7 @@ public class AwResource {
                     isr.close();
                 }
             } catch (IOException e) {
+                // Nothing to do if close() fails.
             }
         }
         return result;
diff --git a/android_webview/test/shell/src/org/chromium/android_webview/shell/AwShellResourceProvider.java b/android_webview/test/shell/src/org/chromium/android_webview/shell/AwShellResourceProvider.java
index ec223aa8..d42692f 100644
--- a/android_webview/test/shell/src/org/chromium/android_webview/shell/AwShellResourceProvider.java
+++ b/android_webview/test/shell/src/org/chromium/android_webview/shell/AwShellResourceProvider.java
@@ -8,6 +8,9 @@ import android.content.Context;
 
 import org.chromium.android_webview.AwResource;
 
+/**
+ * Registers resources for the Android webview shell.
+ */
 public class AwShellResourceProvider {
     private static boolean sInitialized;
 
@@ -18,10 +21,9 @@ public class AwShellResourceProvider {
 
         AwResource.setResources(context.getResources());
 
-        AwResource.RAW_LOAD_ERROR = R.raw.blank_html;
-        AwResource.RAW_NO_DOMAIN = R.raw.blank_html;
+        AwResource.setErrorPageResources(R.raw.blank_html, R.raw.blank_html);
 
-        AwResource.STRING_DEFAULT_TEXT_ENCODING = R.string.test_string;
+        AwResource.setDefaultTextEncoding(R.string.test_string);
 
         sInitialized = true;
     }
diff --git a/build/android/findbugs_filter/findbugs_known_bugs.txt b/build/android/findbugs_filter/findbugs_known_bugs.txt
index 76bc828..739790f 100644
--- a/build/android/findbugs_filter/findbugs_known_bugs.txt
+++ b/build/android/findbugs_filter/findbugs_known_bugs.txt
@@ -27,9 +27,9 @@ M V EI2: org.chromium.chrome.browser.ChromeBrowserProvider$BookmarkNode.setThumb
 M V EI2: org.chromium.content.browser.LoadUrlParams.setPostData(byte[]) may expose internal representation by storing an externally mutable object into LoadUrlParams.mPostData  At LoadUrlParams.java
 M V EI: org.chromium.chrome.browser.ChromeBrowserProvider$BookmarkNode.favicon() may expose internal representation by returning ChromeBrowserProvider$BookmarkNode.mFavicon  At ChromeBrowserProvider.java
 M V EI: org.chromium.chrome.browser.ChromeBrowserProvider$BookmarkNode.thumbnail() may expose internal representation by returning ChromeBrowserProvider$BookmarkNode.mThumbnail  At ChromeBrowserProvider.java
-M V MS: org.chromium.android_webview.AwResource.RAW_LOAD_ERROR isn't final and can't be protected from malicious code   In AwResource.java
-M V MS: org.chromium.android_webview.AwResource.RAW_NO_DOMAIN isn't final and can't be protected from malicious code   In AwResource.java
-M V MS: org.chromium.android_webview.AwResource.STRING_DEFAULT_TEXT_ENCODING isn't final and can't be protected from malicious code   In AwResource.java
+M V MS: org.chromium.android_webview.AwResource.RAW_LOAD_ERROR should be package protected  In AwResource.java
+M V MS: org.chromium.android_webview.AwResource.RAW_NO_DOMAIN should be package protected  In AwResource.java
+M V MS: org.chromium.android_webview.AwResource.STRING_DEFAULT_TEXT_ENCODING should be package protected  In AwResource.java
 M V MS: org.chromium.content.browser.LoadUrlParams.LOAD_TYPE_BROWSER_INITIATED_HTTP_POST should be package protected  In LoadUrlParams.java
 M V MS: org.chromium.content.browser.LoadUrlParams.LOAD_TYPE_DATA isn't final and can't be protected from malicious code   In LoadUrlParams.java
 M V MS: org.chromium.content.browser.LoadUrlParams.LOAD_TYPE_DEFAULT should be package protected  In LoadUrlParams.java