Revert move of file access control into browser context

Follow up to crrev.com/206516 - in the end that patch didn't need this
part of the change and it turns out to be awkward to provide this info
at browser context creation time anyway.

BUG=

Review URL: https://chromiumcodereview.appspot.com/17132003

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

2 files changed, 4 insertions, 20 deletions

diff --git a/android_webview/java/src/org/chromium/android_webview/AwBrowserContext.java b/android_webview/java/src/org/chromium/android_webview/AwBrowserContext.java
index 9b0c987..f3368b2 100644
--- a/android_webview/java/src/org/chromium/android_webview/AwBrowserContext.java
+++ b/android_webview/java/src/org/chromium/android_webview/AwBrowserContext.java
@@ -24,14 +24,7 @@ public class AwBrowserContext {
     private AwGeolocationPermissions mGeolocationPermissions;
     private AwCookieManager mCookieManager;
     private AwFormDatabase mFormDatabase;
-    boolean mIsFileAccessGrantedByDefault;
 
-    public AwBrowserContext(SharedPreferences sharedPreferences,
-            boolean isFileAccessGrantedByDefault) {
-        mIsFileAccessGrantedByDefault = isFileAccessGrantedByDefault;
-    }
-
-    @Deprecated
     public AwBrowserContext(SharedPreferences sharedPreferences) {
         mSharedPreferences = sharedPreferences;
     }
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 9793b06..f82adb9 100644
--- a/android_webview/java/src/org/chromium/android_webview/AwContents.java
+++ b/android_webview/java/src/org/chromium/android_webview/AwContents.java
@@ -316,24 +316,15 @@ public class AwContents {
      * @param containerView the view-hierarchy item this object will be bound to.
      * @param internalAccessAdapter to access private methods on containerView.
      * @param contentsClient will receive API callbacks from this WebView Contents
+     * @param isAccessFromFileURLsGrantedByDefault passed to AwSettings.
      *
      * This constructor uses the default view sizing policy.
      */
     public AwContents(AwBrowserContext browserContext, ViewGroup containerView,
-            InternalAccessDelegate internalAccessAdapter, AwContentsClient contentsClient) {
-        this(browserContext, containerView, internalAccessAdapter, contentsClient,
-                new AwLayoutSizer());
-    }
-
-    // TODO(joth): Remove this overload when downstream no-longer passing
-    // isAccessFromFileURLsGrantedByDefault.
-    @Deprecated
-    public AwContents(AwBrowserContext browserContext, ViewGroup containerView,
             InternalAccessDelegate internalAccessAdapter, AwContentsClient contentsClient,
             boolean isAccessFromFileURLsGrantedByDefault) {
         this(browserContext, containerView, internalAccessAdapter, contentsClient,
-                new AwLayoutSizer());
-        browserContext.mIsFileAccessGrantedByDefault = isAccessFromFileURLsGrantedByDefault;
+                isAccessFromFileURLsGrantedByDefault, new AwLayoutSizer());
     }
 
     private static ContentViewCore createAndInitializeContentViewCore(ViewGroup containerView,
@@ -360,7 +351,7 @@ public class AwContents {
      */
     public AwContents(AwBrowserContext browserContext, ViewGroup containerView,
             InternalAccessDelegate internalAccessAdapter, AwContentsClient contentsClient,
-            AwLayoutSizer layoutSizer) {
+            boolean isAccessFromFileURLsGrantedByDefault, AwLayoutSizer layoutSizer) {
         mBrowserContext = browserContext;
         mContainerView = containerView;
         mInternalAccessAdapter = internalAccessAdapter;
@@ -388,7 +379,7 @@ public class AwContents {
                     }
                 };
         mSettings = new AwSettings(hasInternetPermission, zoomListener,
-                mBrowserContext.mIsFileAccessGrantedByDefault, mDIPScale);
+                isAccessFromFileURLsGrantedByDefault, mDIPScale);
         mDefaultVideoPosterRequestHandler = new DefaultVideoPosterRequestHandler(mContentsClient);
         mSettings.setDefaultVideoPosterURL(
                 mDefaultVideoPosterRequestHandler.getDefaultVideoPosterURL());