Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(31)

Side by Side Diff: chrome/android/javatests/src/org/chromium/chrome/browser/superviseduser/SupervisedUserContentProviderTest.java

Issue 2713513004: [Webview, Child Accounts] Always Google Play Services to show the reauthentication page. (Closed)
Patch Set: review Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 package org.chromium.chrome.browser.superviseduser; 5 package org.chromium.chrome.browser.superviseduser;
6 6
7 import android.accounts.Account; 7 import android.accounts.Account;
8 import android.content.ContentProviderClient; 8 import android.content.ContentProviderClient;
9 import android.content.ContentResolver; 9 import android.content.ContentResolver;
10 import android.database.Cursor; 10 import android.database.Cursor;
(...skipping 24 matching lines...) Expand all
35 private String mAuthority; 35 private String mAuthority;
36 private Uri mUri; 36 private Uri mUri;
37 37
38 public SupervisedUserContentProviderTest() { 38 public SupervisedUserContentProviderTest() {
39 super(ChromeActivity.class); 39 super(ChromeActivity.class);
40 } 40 }
41 41
42 @Override 42 @Override
43 public void setUp() throws Exception { 43 public void setUp() throws Exception {
44 super.setUp(); 44 super.setUp();
45 mResolver = getInstrumentation().getContext().getContentResolver(); 45 mResolver = getInstrumentation().getTargetContext().getContentResolver() ;
46 assertNotNull(mResolver); 46 assertNotNull(mResolver);
47 mAuthority = getInstrumentation().getTargetContext().getPackageName() + AUTHORITY_SUFFIX; 47 mAuthority = getInstrumentation().getTargetContext().getPackageName() + AUTHORITY_SUFFIX;
48 mUri = new Uri.Builder() 48 mUri = new Uri.Builder()
49 .scheme(ContentResolver.SCHEME_CONTENT) 49 .scheme(ContentResolver.SCHEME_CONTENT)
50 .authority(mAuthority) 50 .authority(mAuthority)
51 .path("authorized") 51 .path("authorized")
52 .build(); 52 .build();
53 SigninTestUtil.resetSigninState(); 53 SigninTestUtil.resetSigninState();
54 } 54 }
55 55
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 ContentProviderClient client = mResolver.acquireContentProviderClient(mA uthority); 115 ContentProviderClient client = mResolver.acquireContentProviderClient(mA uthority);
116 assertNotNull(client); 116 assertNotNull(client);
117 SupervisedUserContentProvider.enableContentProviderForTesting(); 117 SupervisedUserContentProvider.enableContentProviderForTesting();
118 // setFilter for testing sets a default filter that blocks by default. 118 // setFilter for testing sets a default filter that blocks by default.
119 mResolver.call(mUri, "setFilterForTesting", null, null); 119 mResolver.call(mUri, "setFilterForTesting", null, null);
120 Cursor cursor = client.query(mUri, null, "url = 'http://www.google.com'" , null, null); 120 Cursor cursor = client.query(mUri, null, "url = 'http://www.google.com'" , null, null);
121 assertNotNull(cursor); 121 assertNotNull(cursor);
122 assertEquals(WebRestrictionsContentProvider.BLOCKED, cursor.getInt(0)); 122 assertEquals(WebRestrictionsContentProvider.BLOCKED, cursor.getInt(0));
123 } 123 }
124 } 124 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698