diff options
| author | aberent <aberent@chromium.org> | 2016-01-05 05:04:48 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-01-05 13:05:38 +0000 |
| commit | ec7d1d143650ceef3969c9181b8e7fe4f9d6b820 (patch) | |
| tree | 862081b17670fb457a0a4c00c253a04fdb4a6f27 /components/components.gyp | |
| parent | 7433487e4082c928a06ddff51fe5c963a28da3ef (diff) | |
| download | chromium_src-ec7d1d143650ceef3969c9181b8e7fe4f9d6b820.zip chromium_src-ec7d1d143650ceef3969c9181b8e7fe4f9d6b820.tar.gz chromium_src-ec7d1d143650ceef3969c9181b8e7fe4f9d6b820.tar.bz2 | |
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
Review URL: https://codereview.chromium.org/1552333002
Cr-Commit-Position: refs/heads/master@{#367512}
Diffstat (limited to 'components/components.gyp')
| -rw-r--r-- | components/components.gyp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/components/components.gyp b/components/components.gyp index a4b3169..c83d0aa 100644 --- a/components/components.gyp +++ b/components/components.gyp @@ -101,6 +101,7 @@ 'version_info.gypi', 'version_ui.gypi', 'web_resource.gypi', + 'web_restriction.gypi', 'webdata.gypi', 'webdata_services.gypi', ], |