Resubmit Supervised user web restrictions content provider

Resubmit Supervised user web restrictions content provider

This resubmits https://codereview.chromium.org/1452603002/ which
was reverted by https://codereview.chromium.org/1539653002/

The previous version of SupervisedUserContentProviderUnitTest was
using Java Thread objects, which seems to confuse Robolectric. I
have now removed this, which slightly reduces the coverage of the
tests (it no longer tests that the threading is correct) but allows
them to run.

TBR=jochen@chromium.org
BUG=570768
Committed: https://crrev.com/ec7d1d143650ceef3969c9181b8e7fe4f9d6b820
Cr-Commit-Position: refs/heads/master@{#367512}

[aberent, 2016-01-04 20:03:44]

aberent@chromium.org changed reviewers:
+ bauerb@chromium.org, jochen@chromium.org

[aberent, 2016-01-04 20:03:45]

bauerb@chromium.org: Please review changes to
SupervisedUserContentProviderUnitTest and SupervisedUserContentProvider.
Everything else is identical to the previous CL.

jochen@chromium.org: Please rubber stamp the changes you reviewed previously.
Everything is identical to the previous CL.

[aberent, 2016-01-04 20:06:09]

The CQ bit was checked by aberent@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2016-01-04 20:07:18]

Dry run: CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1552333002/20001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1552333002/20001

[commit-bot: I haz the power, 2016-01-05 00:40:42]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-01-05 00:40:43]

Dry run: This issue passed the CQ dry run.

[Bernhard Bauer, 2016-01-05 10:22:32]

https://codereview.chromium.org/1552333002/diff/1/chrome/android/java/src/org...
File
chrome/android/java/src/org/chromium/chrome/browser/superviseduser/SupervisedUserContentProvider.java
(right):

https://codereview.chromium.org/1552333002/diff/1/chrome/android/java/src/org...
chrome/android/java/src/org/chromium/chrome/browser/superviseduser/SupervisedUserContentProvider.java:69:
assert !ThreadUtils.runningOnUiThread();
Actually... if everything but this works without using real threads in the test,
couldn't we get this to work by setting a different Looper for the UI thread?
This method uses == to compare loopers, so just passing a spy would already
satisfy this check, without impacting functionality 😃

https://codereview.chromium.org/1552333002/diff/20001/chrome/android/java/src...
File
chrome/android/java/src/org/chromium/chrome/browser/superviseduser/SupervisedUserContentProvider.java
(right):

https://codereview.chromium.org/1552333002/diff/20001/chrome/android/java/src...
chrome/android/java/src/org/chromium/chrome/browser/superviseduser/SupervisedUserContentProvider.java:69:
//TODO(https://crbug.com/570768) Should assert that this isn't running on the
UIThread, but
Space after the comment begins. Then after that I don't think you need to indent
the comment.

[aberent, 2016-01-05 10:47:59]

The CQ bit was checked by aberent@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2016-01-05 10:48:26]

Dry run: CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1552333002/40001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1552333002/40001

[aberent, 2016-01-05 10:48:38]

https://codereview.chromium.org/1552333002/diff/1/chrome/android/java/src/org...
File
chrome/android/java/src/org/chromium/chrome/browser/superviseduser/SupervisedUserContentProvider.java
(right):

https://codereview.chromium.org/1552333002/diff/1/chrome/android/java/src/org...
chrome/android/java/src/org/chromium/chrome/browser/superviseduser/SupervisedUserContentProvider.java:69:
assert !ThreadUtils.runningOnUiThread();
On 2016/01/05 10:22:32, bauerb catching up on reviews wrote:
> Actually... if everything but this works without using real threads in the
test,
> couldn't we get this to work by setting a different Looper for the UI thread?
> This method uses == to compare loopers, so just passing a spy would already
> satisfy this check, without impacting functionality 😃

On further thought this assertion no longer makes sense. The UI thread runnable
will no longer lock up if this is called on the UI thread (because of switching
from queues to latches) so, while we don't expect this to be called on the UI
thread, doing so is now harmless. I will take out the TODO.

https://codereview.chromium.org/1552333002/diff/20001/chrome/android/java/src...
File
chrome/android/java/src/org/chromium/chrome/browser/superviseduser/SupervisedUserContentProvider.java
(right):

https://codereview.chromium.org/1552333002/diff/20001/chrome/android/java/src...
chrome/android/java/src/org/chromium/chrome/browser/superviseduser/SupervisedUserContentProvider.java:69:
//TODO(https://crbug.com/570768) Should assert that this isn't running on the
UIThread, but
On 2016/01/05 10:22:32, bauerb catching up on reviews wrote:
> Space after the comment begins. Then after that I don't think you need to
indent
> the comment.

Removing TODO. See my other reply.

[commit-bot: I haz the power, 2016-01-05 10:50:41]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-01-05 10:50:42]

Dry run: Try jobs failed on following builders:
  cast_shell_linux on tryserver.chromium.linux (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/cast_shell_linu...)
  chromeos_daisy_chromium_compile_only_ng on tryserver.chromium.linux
(JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/chromeos_daisy_...)
  ios_dbg_simulator_ninja on tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/ios_dbg_simulator...)
  ios_rel_device_ninja on tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/ios_rel_device_ni...)
  mac_chromium_rel_ng on tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/mac_chromium_rel_...)

[Bernhard Bauer, 2016-01-05 10:51:01]

LGTM!

[aberent, 2016-01-05 11:20:27]

Description was changed from

==========
Resubmit Supervised user web restrictions content provider

This resubmits https://codereview.chromium.org/1452603002/ which
was reverted by https://codereview.chromium.org/1539653002/

The previous version of SupervisedUserContentProviderUnitTest was
using Java Thread objects, which seems to confuse Robolectric. I
have now removed this, which slightly reduces the coverage of the
tests (it no longer tests that the threading is correct) but allows
them to run.

BUG=570768
==========

to

==========
Resubmit Supervised user web restrictions content provider

This resubmits https://codereview.chromium.org/1452603002/ which
was reverted by https://codereview.chromium.org/1539653002/

The previous version of SupervisedUserContentProviderUnitTest was
using Java Thread objects, which seems to confuse Robolectric. I
have now removed this, which slightly reduces the coverage of the
tests (it no longer tests that the threading is correct) but allows
them to run.

TBR=jochen@chromium.org
BUG=570768
==========

[aberent, 2016-01-05 11:21:21]

The CQ bit was checked by aberent@chromium.org

[aberent, 2016-01-05 11:21:21]

The patchset sent to the CQ was uploaded after l-g-t-m from bauerb@chromium.org
Link to the patchset: https://codereview.chromium.org/1552333002/#ps60001
(title: "Manual rebase to fix merge problem")

[commit-bot: I haz the power, 2016-01-05 11:21:47]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1552333002/60001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1552333002/60001

[commit-bot: I haz the power, 2016-01-05 13:04:55]

Description was changed from

==========
Resubmit Supervised user web restrictions content provider

This resubmits https://codereview.chromium.org/1452603002/ which
was reverted by https://codereview.chromium.org/1539653002/

The previous version of SupervisedUserContentProviderUnitTest was
using Java Thread objects, which seems to confuse Robolectric. I
have now removed this, which slightly reduces the coverage of the
tests (it no longer tests that the threading is correct) but allows
them to run.

TBR=jochen@chromium.org
BUG=570768
==========

to

==========
Resubmit Supervised user web restrictions content provider

This resubmits https://codereview.chromium.org/1452603002/ which
was reverted by https://codereview.chromium.org/1539653002/

The previous version of SupervisedUserContentProviderUnitTest was
using Java Thread objects, which seems to confuse Robolectric. I
have now removed this, which slightly reduces the coverage of the
tests (it no longer tests that the threading is correct) but allows
them to run.

TBR=jochen@chromium.org
BUG=570768
==========

[commit-bot: I haz the power, 2016-01-05 13:04:55]

Committed patchset #4 (id:60001)

[commit-bot: I haz the power, 2016-01-05 13:05:43]

Description was changed from

==========
Resubmit Supervised user web restrictions content provider

This resubmits https://codereview.chromium.org/1452603002/ which
was reverted by https://codereview.chromium.org/1539653002/

The previous version of SupervisedUserContentProviderUnitTest was
using Java Thread objects, which seems to confuse Robolectric. I
have now removed this, which slightly reduces the coverage of the
tests (it no longer tests that the threading is correct) but allows
them to run.

TBR=jochen@chromium.org
BUG=570768
==========

to

==========
Resubmit Supervised user web restrictions content provider

This resubmits https://codereview.chromium.org/1452603002/ which
was reverted by https://codereview.chromium.org/1539653002/

The previous version of SupervisedUserContentProviderUnitTest was
using Java Thread objects, which seems to confuse Robolectric. I
have now removed this, which slightly reduces the coverage of the
tests (it no longer tests that the threading is correct) but allows
them to run.

TBR=jochen@chromium.org
BUG=570768

Committed: https://crrev.com/ec7d1d143650ceef3969c9181b8e7fe4f9d6b820
Cr-Commit-Position: refs/heads/master@{#367512}
==========

[commit-bot: I haz the power, 2016-01-05 13:05:44]

Patchset 4 (id:??) landed as
https://crrev.com/ec7d1d143650ceef3969c9181b8e7fe4f9d6b820
Cr-Commit-Position: refs/heads/master@{#367512}