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

chrome/android/junit/src/org/chromium/chrome/browser/superviseduser/SupervisedUserContentProviderUnitTest.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.chrome.browser.superviseduser;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyLong;
@@ skipping 35 matching lines @@
  * provider. The content provider aspects are tested with WebRestrictionsContentProviderTest.
  */
 @RunWith(LocalRobolectricTestRunner.class)
 @Config(manifest = Config.NONE)
 public class SupervisedUserContentProviderUnitTest {
     @Rule
     public DisableHistogramsRule mDisableHistogramsRule = new DisableHistogramsRule();
 
     private SupervisedUserContentProvider mSupervisedUserContentProvider;
 
+    private static final String DEFAULT_CALLING_PACKAGE = "com.example.some.app";
+
     @Before
     public void setUp() {
         // Ensure clean state (in particular not signed in).
         ContextUtils.getAppSharedPreferences().edit().clear().apply();
 
         // Spy on the content provider so that we can watch its calls. Override methods that wrap
         // things that can't be mocked (including native calls).
         mSupervisedUserContentProvider = Mockito.spy(new SupervisedUserContentProvider() {
             @Override
             void startForcedSigninProcessor(Context context, Runnable onComplete) {
@@ skipping 27 matching lines @@
     @After
     public void shutDown() {
         ContextUtils.getAppSharedPreferences().edit().clear().apply();
         ChromeBrowserInitializer.setForTesting(null);
     }
 
     @Test
     public void testShouldProceed_PermittedUrl() {
         mSupervisedUserContentProvider.setNativeSupervisedUserContentProviderForTesting(1234L);
         // Mock the native call for a permitted URL
-        WebRestrictionsResult result = mSupervisedUserContentProvider.shouldProceed("url");
+        WebRestrictionsResult result =
+                mSupervisedUserContentProvider.shouldProceed(DEFAULT_CALLING_PACKAGE, "url");
         assertThat(result.shouldProceed(), is(true));
         verify(mSupervisedUserContentProvider)
                 .nativeShouldProceed(eq(1234L),
                         any(SupervisedUserContentProvider.SupervisedUserQueryReply.class),
                         eq("url"));
     }
 
     @Test
     public void testShouldProceed_ForbiddenUrl() {
         mSupervisedUserContentProvider.setNativeSupervisedUserContentProviderForTesting(1234L);
         // Modify the result of the native call to make this a forbidden URL
         doAnswer(new Answer<Void>() {
 
             @Override
             public Void answer(InvocationOnMock invocation) throws Throwable {
                 invocation.<SupervisedUserQueryReply>getArgument(1).onQueryFailed(1, 2, 3, "url1",
                         "url2", "custodian", "custodianEmail", "secondCustodian",
                         "secondCustodianEmail");
                 return null;
             }
 
         })
                 .when(mSupervisedUserContentProvider)
                 .nativeShouldProceed(anyLong(),
                         any(SupervisedUserContentProvider.SupervisedUserQueryReply.class),
                         anyString());
-        WebRestrictionsResult result = mSupervisedUserContentProvider.shouldProceed("url");
+        WebRestrictionsResult result =
+                mSupervisedUserContentProvider.shouldProceed(DEFAULT_CALLING_PACKAGE, "url");
         assertThat(result.shouldProceed(), is(false));
         assertThat(result.errorIntCount(), is(3));
         assertThat(result.getErrorInt(0), is(1));
         assertThat(result.getErrorInt(1), is(2));
         assertThat(result.getErrorInt(2), is(3));
         assertThat(result.errorStringCount(), is(6));
         assertThat(result.getErrorString(0), is("url1"));
         assertThat(result.getErrorString(1), is("url2"));
         assertThat(result.getErrorString(2), is("custodian"));
         assertThat(result.getErrorString(3), is("custodianEmail"));
@@ skipping 39 matching lines @@
     }
 
     @Test
     public void testShouldProceed_withStartupSignedIn() throws ProcessInitException {
         // Set up a signed in user
         ChromeSigninController.get(RuntimeEnvironment.application).setSignedInAccountName("Dummy");
         // Mock things called during startup
         ChromeBrowserInitializer mockBrowserInitializer = mock(ChromeBrowserInitializer.class);
         ChromeBrowserInitializer.setForTesting(mockBrowserInitializer);
 
-        WebRestrictionsResult result = mSupervisedUserContentProvider.shouldProceed("url");
+        WebRestrictionsResult result =
+                mSupervisedUserContentProvider.shouldProceed(DEFAULT_CALLING_PACKAGE, "url");
 
         assertThat(result.shouldProceed(), is(true));
         verify(mockBrowserInitializer).handleSynchronousStartup();
         verify(mSupervisedUserContentProvider)
                 .nativeShouldProceed(eq(5678L),
                         any(SupervisedUserContentProvider.SupervisedUserQueryReply.class),
                         eq("url"));
     }
 
     @SuppressWarnings("unchecked")
     @Test
     public void testShouldProceed_notSignedIn() throws ProcessInitException {
         // Mock things called during startup
         ChromeBrowserInitializer mockBrowserInitializer = mock(ChromeBrowserInitializer.class);
         ChromeBrowserInitializer.setForTesting(mockBrowserInitializer);
         AccountManagerDelegate mockDelegate = mock(AccountManagerDelegate.class);
         AccountManagerHelper.overrideAccountManagerHelperForTests(
                 RuntimeEnvironment.application, mockDelegate);
         Account account = new Account("Google", "Dummy");
         when(mockDelegate.getAccountsByType("Google")).thenReturn(new Account[] {account});
 
-        WebRestrictionsResult result = mSupervisedUserContentProvider.shouldProceed("url");
+        WebRestrictionsResult result =
+                mSupervisedUserContentProvider.shouldProceed(DEFAULT_CALLING_PACKAGE, "url");
 
         assertThat(result.shouldProceed(), is(true));
         verify(mockBrowserInitializer).handleSynchronousStartup();
         verify(mSupervisedUserContentProvider)
                 .startForcedSigninProcessor(any(Context.class), any(Runnable.class));
         verify(mSupervisedUserContentProvider)
                 .listenForChildAccountStatusChange(any(Callback.class));
         verify(mSupervisedUserContentProvider)
                 .nativeShouldProceed(eq(5678L),
                         any(SupervisedUserContentProvider.SupervisedUserQueryReply.class),
                         eq("url"));
     }
 
     @Test
-    public void testShouldProceed_cannotSignIn() throws ProcessInitException {
+    public void testShouldProceed_cannotSignIn() {
         // Mock things called during startup
         ChromeBrowserInitializer mockBrowserInitializer = mock(ChromeBrowserInitializer.class);
         ChromeBrowserInitializer.setForTesting(mockBrowserInitializer);
         AccountManagerDelegate mockDelegate = mock(AccountManagerDelegate.class);
         AccountManagerHelper.overrideAccountManagerHelperForTests(
                 RuntimeEnvironment.application, mockDelegate);
         Account account = new Account("Google", "Dummy");
         when(mockDelegate.getAccountsByType("Google")).thenReturn(new Account[] {account});
 
         // Change the behavior of the forced sign-in processor to not sign in.
         doAnswer(new Answer<Void>() {
             @Override
             public Void answer(InvocationOnMock invocation) throws Throwable {
                 invocation.<Runnable>getArgument(1).run();
                 return null;
             }
         })
                 .when(mSupervisedUserContentProvider)
                 .startForcedSigninProcessor(any(Context.class), any(Runnable.class));
 
-        WebRestrictionsResult result = mSupervisedUserContentProvider.shouldProceed("url");
+        WebRestrictionsResult result =
+                mSupervisedUserContentProvider.shouldProceed(DEFAULT_CALLING_PACKAGE, "url");
 
         assertThat(result.shouldProceed(), is(false));
         assertThat(result.getErrorInt(0), is(5));
     }
+
+    @Test
+    public void testShouldProceed_requestWhitelisted() {
+        mSupervisedUserContentProvider.setNativeSupervisedUserContentProviderForTesting(1234L);
+
+        // Modify the result of the native call to block any URL.
+        doAnswer(new Answer<Void>() {
+            @Override
+            public Void answer(InvocationOnMock invocation) throws Throwable {
+                invocation.<SupervisedUserQueryReply>getArgument(1).onQueryFailed(1, 2, 3, "url1",
+                        "url2", "custodian", "custodianEmail", "secondCustodian",
+                        "secondCustodianEmail");
+                return null;
+            }
+        })
+                .when(mSupervisedUserContentProvider)
+                .nativeShouldProceed(eq(1234L),
+                        any(SupervisedUserContentProvider.SupervisedUserQueryReply.class),
+                        anyString());
+
+        WebRestrictionsResult allowed = mSupervisedUserContentProvider.shouldProceed(
+                "com.google.android.gms.ui", "https://accounts.google.com/reauth");
+        assertThat(allowed.shouldProceed(), is(true));
+
+        WebRestrictionsResult wrongUrl = mSupervisedUserContentProvider.shouldProceed(
+                "com.google.android.gms.ui", "http://www.example.com");
+        assertThat(wrongUrl.shouldProceed(), is(false));
+
+        WebRestrictionsResult wrongCallingPackage = mSupervisedUserContentProvider.shouldProceed(
+                DEFAULT_CALLING_PACKAGE, "https://accounts.google.com/reauth");
+        assertThat(wrongCallingPackage.shouldProceed(), is(false));
+
+        WebRestrictionsResult nullCallingPackage = mSupervisedUserContentProvider.shouldProceed(
+                null, "https://accounts.google.com/reauth");
+        assertThat(nullCallingPackage.shouldProceed(), is(false));
+    }
 }