[Webview, Child Accounts] Always Google Play Services to show the reauthentication page.

components/web_restrictions/browser/java/src/org/chromium/components/webrestrictions/browser/WebRestrictionsContentProvider.java

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.components.webrestrictions.browser;
 
+import android.annotation.TargetApi;
 import android.content.ContentProvider;
 import android.content.ContentValues;
 import android.content.Context;
 import android.content.UriMatcher;
 import android.content.pm.ProviderInfo;
 import android.database.AbstractCursor;
 import android.database.Cursor;
 import android.net.Uri;
+import android.os.Build;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 /**
  * Abstract content provider for providing web restrictions, i.e. for providing a filter for URLs so
  * that they can be blocked or permitted, and a means of requesting permission for new URLs. It
  * provides two (virtual) tables; an 'authorized' table listing the the status of every URL, and a
  * 'requested' table containing the requests for access to new URLs. The 'authorized' table is read
  * only and the 'requested' table is write only.
@@ skipping 76 matching lines @@
     public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs,
             String sortOrder) {
         if (!contentProviderEnabled()) return null;
         // Check that this is the a query on the 'authorized' table
         // TODO(aberent): Provide useful queries on the 'requested' table.
         if (mContentUriMatcher.match(uri) != AUTHORIZED) return null;
         // If the selection is of the right form get the url we are querying.
         Matcher matcher = mSelectionPattern.matcher(selection);
         if (!matcher.find()) return null;
         final String url = matcher.group(1);
-        final WebRestrictionsResult result = shouldProceed(url);
+        final WebRestrictionsResult result = shouldProceed(maybeGetCallingPackage(), url);
         if (result == null) return null;
 
         return new AbstractCursor() {
 
             @Override
             public int getCount() {
                 return 1;
             }
 
             @Override
@@ skipping 72 matching lines @@
                 return FIELD_TYPE_NULL;
             }
 
             @Override
             public int getColumnCount() {
                 return result.errorIntCount() + result.errorStringCount() + 1;
             }
         };
     }
 
+    @TargetApi(Build.VERSION_CODES.KITKAT)
+    private String maybeGetCallingPackage() {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT) return null;
+
+        return getCallingPackage();
+    }
+
     @Override
     public String getType(Uri uri) {
         // Abused to return whether we can insert
         if (!contentProviderEnabled()) return null;
         if (mContentUriMatcher.match(uri) != REQUESTED) return null;
         return canInsert() ? "text/plain" : null;
     }
 
     @Override
     public Uri insert(Uri uri, ContentValues values) {
@@ skipping 13 matching lines @@
     public int delete(Uri uri, String selection, String[] selectionArgs) {
         return 0;
     }
 
     @Override
     public int update(Uri uri, ContentValues values, String selection, String[] selectionArgs) {
         return 0;
     }
 
     /**
+     * @param the package calling the content provider, or null if the package is not available.
      * @param url the URL that is wanted.
      * @return a pair containing the Result and the HTML Error Message. result is true if safe to
      *         proceed, false otherwise. error message is only meaningful if result is false, a null
      *         error message means use application default.
      */
-    protected abstract WebRestrictionsResult shouldProceed(final String url);
+    protected abstract WebRestrictionsResult shouldProceed(String callingPackage, String url);
 
     /**
      * @return whether the content provider allows insertions.
      */
     protected abstract boolean canInsert();
 
     /**
      * @return the names of the custom error columns, integer valued columns must proceed string
      * valued columns.
      */
@@ skipping 12 matching lines @@
     protected abstract boolean contentProviderEnabled();
 
     /**
      * Call to tell observers that the filter has changed.
      */
     protected void onFilterChanged() {
         getContext().getContentResolver().notifyChange(
                 mContentUri.buildUpon().appendPath("authorized").build(), null);
     }
 }