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

components/web_restrictions/browser/junit/src/org/chromium/components/webrestrictions/browser/WebRestrictionsContentProviderTest.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 static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.not;
 import static org.hamcrest.CoreMatchers.nullValue;
 import static org.junit.Assert.assertThat;
 import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import android.content.ContentResolver;
 import android.content.ContentValues;
 import android.content.pm.ProviderInfo;
 import android.database.Cursor;
 import android.net.Uri;
 
-import org.chromium.components.webrestrictions.browser.WebRestrictionsContentProvider.WebRestrictionsResult;
-import org.chromium.testing.local.LocalRobolectricTestRunner;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.ArgumentMatchers;
 import org.mockito.Mockito;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowContentResolver;
 
+import org.chromium.components.webrestrictions.browser.WebRestrictionsContentProvider.WebRestrictionsResult;
+import org.chromium.testing.local.LocalRobolectricTestRunner;
+
 /**
  * Tests of WebRestrictionsContentProvider.
  */
 @RunWith(LocalRobolectricTestRunner.class)
 @Config(manifest = Config.NONE)
 public class WebRestrictionsContentProviderTest {
     private static final String AUTHORITY = "org.chromium.browser.DummyProvider";
 
     private WebRestrictionsContentProvider mContentProvider;
     private ContentResolver mContentResolver;
     private Uri mUri;
 
     @Before
     public void setUp() {
         // The test needs a concrete version of the test class, but mocks the additional members as
         // necessary.
         mContentProvider = Mockito.spy(new WebRestrictionsContentProvider() {
             @Override
-            protected WebRestrictionsResult shouldProceed(String url) {
+            protected WebRestrictionsResult shouldProceed(String callingPackage, String url) {
                 return null;
             }
 
             @Override
             protected boolean canInsert() {
                 return false;
             }
 
             @Override
             protected boolean requestInsert(String url) {
@@ skipping 25 matching lines @@
     @Test
     public void testQuery() {
         when(mContentProvider.contentProviderEnabled()).thenReturn(false);
         assertThat(mContentResolver.query(mUri.buildUpon().appendPath("authorized").build(), null,
                            "url = 'dummy'", null, null),
                 is(nullValue()));
         when(mContentProvider.contentProviderEnabled()).thenReturn(true);
         int errorInt[] = {42};
         String errorString[] = {"Error Message"};
         WebRestrictionsResult result = new WebRestrictionsResult(false, errorInt, errorString);
-        when(mContentProvider.shouldProceed(anyString())).thenReturn(result);
+        when(mContentProvider.shouldProceed(ArgumentMatchers.<String>isNull(), anyString()))
+                .thenReturn(result);
         Cursor cursor = mContentResolver.query(mUri.buildUpon().appendPath("authorized").build(),
                 null, "url = 'dummy'", null, null);
-        verify(mContentProvider).shouldProceed("dummy");
+        verify(mContentProvider).shouldProceed(ArgumentMatchers.<String>isNull(), eq("dummy"));

[dgn, 2017/02/23 12:19:49]

doesn't `.shouldProceed(null, "dummy")` work here?

[Bernhard Bauer, 2017/02/23 16:36:21]

Yes, if I don't use eq() for the second argument. Done.

         assertThat(cursor, is(not(nullValue())));
         assertThat(cursor.getInt(0), is(WebRestrictionsContentProvider.BLOCKED));
         assertThat(cursor.getInt(1), is(42));
         assertThat(cursor.getString(2), is("Error Message"));
         result = new WebRestrictionsResult(true, null, null);
-        when(mContentProvider.shouldProceed(anyString())).thenReturn(result);
+        when(mContentProvider.shouldProceed(ArgumentMatchers.<String>isNull(), anyString()))
+                .thenReturn(result);
         cursor = mContentResolver.query(mUri.buildUpon().appendPath("authorized").build(), null,
                 "url = 'dummy'", null, null);
         assertThat(cursor, is(not(nullValue())));
         assertThat(cursor.getInt(0), is(WebRestrictionsContentProvider.PROCEED));
     }
 
     @Test
     public void testInsert() {
         ContentValues values = new ContentValues();
         values.put("url", "dummy2");
@@ skipping 24 matching lines @@
         assertThat(mContentResolver.getType(mUri.buildUpon().appendPath("requested").build()),
                 is(nullValue()));
         when(mContentProvider.canInsert()).thenReturn(true);
         assertThat(mContentResolver.getType(mUri.buildUpon().appendPath("requested").build()),
                 is(not(nullValue())));
         when(mContentProvider.contentProviderEnabled()).thenReturn(false);
         assertThat(mContentResolver.getType(mUri.buildUpon().appendPath("junk").build()),
                 is(nullValue()));
     }
 }