GitLab

This reverts commit e5a94e05.
Original commit fac52799.

Patchset 1 is a clean revert of the revert.  Fixes in subsequent patchsets.

Only change is fixing some work that was done inside a DCHECK in the tests.

Bug: 821021
Cq-Include-Trybots: luci.chromium.try:linux_mojo;master.tryserver.chromium.android:android_cronet_tester;master.tryserver.chromium.mac:ios-simulator-cronet
Change-Id: Ic1649dc90711c23c33255cc5f1ed9d902eb29f07
Reviewed-on: https://chromium-review.googlesource.com/1147140Reviewed-by: Helen Li <xunjieli@chromium.org>
Commit-Queue: Eric Orth <ericorth@chromium.org>
Cr-Commit-Position: refs/heads/master@{#577362}