[Android] Upstream WebView.allow{Content|File}Access implementation.

content/browser/android/content_settings.cc

Index: content/browser/android/content_settings.cc
diff --git a/content/browser/android/content_settings.cc b/content/browser/android/content_settings.cc
index e8632d6089b25089b57f0eab7788f279009ccf5f..48cd89a65e5f1fb0c2974568c1335140d39bbeba 100644
--- a/content/browser/android/content_settings.cc
+++ b/content/browser/android/content_settings.cc
@@ -77,10 +77,6 @@ struct ContentSettings::FieldIds {
         GetFieldID(env, clazz, "mJavaScriptCanOpenWindowsAutomatically", "Z");
     dom_storage_enabled =
         GetFieldID(env, clazz, "mDomStorageEnabled", "Z");
-    allow_file_url_access =
-        GetFieldID(env, clazz, "mAllowFileUrlAccess", "Z");
-    allow_content_url_access =
-        GetFieldID(env, clazz, "mAllowContentUrlAccess", "Z");
   }
 
   // Field ids
@@ -103,8 +99,6 @@ struct ContentSettings::FieldIds {
   jfieldID allow_file_access_from_file_urls;
   jfieldID java_script_can_open_windows_automatically;
   jfieldID dom_storage_enabled;
-  jfieldID allow_file_url_access;
-  jfieldID allow_content_url_access;
 };
 
 ContentSettings::ContentSettings(JNIEnv* env,