GitLab

This reverts commit 4f725946.

Reason for reland: I think that the reverted CL cannot be responsible for the observed build error as explained here: https://chromium-review.googlesource.com/c/chromium/src/+/2125472/2#message-57912860a46d2c55efc389357cd193cc1068a76f

Original change's description:
> Revert "Migrate PolicyContentScriptXHR test to different test suite."
> 
> This reverts commit b7c2f359.
> 
> Reason for revert: This CL caused an issue in  Linux ChromiumOS Full 
> https://ci.chromium.org/p/chromium/builders/ci/Linux%20ChromiumOS%20Full/159520?
> 
> Original change's description:
> > Migrate PolicyContentScriptXHR test to different test suite.
> > 
> > This CL migrates BackgroundXhrWebstoreTest.PolicyContentScriptXHR to the
> > CrossOriginReadBlockingExtensionAllowlistingTest test suite (into new
> > tests, called ContentScriptVsHostBlockedByPolicy_NoSniffXml and
> > ContentScriptVsHostBlockedByPolicy_AllowedTextResource).
> > 
> > This way the tests covers the following setup aspects:
> > - CorbAllowlistAlsoAppliesToOorCors feature is enabled or disabled
> > - Extension is allowlisted or not
> > - OOR-CORS vs InBlinkCors
> > 
> > After this CL the old test can be deleted.  Note that the old test
> > always tested with:
> > - CorbAllowlistAlsoAppliesToOorCors disabled
> > - Non-allowlisted extension
> > - The default OOR-CORS state (enabled by default since r728462)
> > 
> > Bug: 1061567
> > Change-Id: Ic76ac9e48510953fd130141776e66b1fde11c404
> > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2107431
> > Commit-Queue: Łukasz Anforowicz <lukasza@chromium.org>
> > Reviewed-by: Karan Bhatia <karandeepb@chromium.org>
> > Cr-Commit-Position: refs/heads/master@{#754013}
> 
> TBR=lukasza@chromium.org,karandeepb@chromium.org
> 
> Change-Id: Idbd14b4e66190a533669159402389b738546bee6
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: 1061567
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2125472
> Reviewed-by: Juanmi Huertas <juanmihd@chromium.org>
> Commit-Queue: Juanmi Huertas <juanmihd@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#754249}

TBR=lukasza@chromium.org,karandeepb@chromium.org,juanmihd@chromium.org

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: 1061567
Change-Id: I645636564e64256161251c1b187d13586ef3d625
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2127628Reviewed-by: Łukasz Anforowicz <lukasza@chromium.org>
Commit-Queue: Łukasz Anforowicz <lukasza@chromium.org>
Cr-Commit-Position: refs/heads/master@{#754555}