GitLab

This reverts commit 1f6950fb.

Reason for revert: causing flake on Mac10.12 Tests, e.g. see
https://ci.chromium.org/p/chromium/builders/ci/Mac10.12%20Tests/35842

Original change's description:
> [Prerender] CancelPrerender tests move to NoStatePrefetchTests.
> 
> Move tests that verify logic around canceling prerenders to
> NoStatePrefetchTests.
> 
> Please see this spreadsheet for details:
> 
> https://docs.google.com/spreadsheets/d/1LFPB4UhPWQkBRz481lz49zmS25znhjSDUtagtTTSPQo/edit?usp=sharing
> 
> Bug: 898955
> Change-Id: I038bf08496483cd07545f26ae2937e34d2283e97
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2284991
> Reviewed-by: Ryan Sturm <ryansturm@chromium.org>
> Commit-Queue: Mugdha Lakhani <nator@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#786210}

TBR=ryansturm@chromium.org,nator@chromium.org

Change-Id: I2579084bc935ca97071d2b2990532ae43017ea4f
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 898955
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2288355Reviewed-by: John Abd-El-Malek <jam@chromium.org>
Commit-Queue: John Abd-El-Malek <jam@chromium.org>
Cr-Commit-Position: refs/heads/master@{#786382}