Commit 48c2e8ef authored by Wei-Yin Chen (陳威尹)'s avatar Wei-Yin Chen (陳威尹) Committed by Commit Bot

Revert "[COOP] reporting: reenable OriginTrial tests."

This reverts commit bce04023.

Reason for revert: crbug.com/1120212

Original change's description:
> [COOP] reporting: reenable OriginTrial tests.
> 
> Reenable two test:
> -CoopReportingOriginTrialBrowserTest.AccessReportingWithToken
> -CoopReportingOriginTrialBrowserTest.CoopStateWithToken
> 
> They were disabled by:
> https://chromium-review.googlesource.com/c/chromium/src/+/2365362
> 
> We think this might be fixed by:
> https://chromium-review.googlesource.com/c/chromium/src/+/2366778
> 
> Feel free to immediately revert this patch if the two tests start to
> fail. We will also monitor them today.
> 
> Bug: 1119555
> Change-Id: Ibd6fc4af82fcc4cbd3dcf5fe2b1472d81cb9c8cf
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2366894
> Reviewed-by: Camille Lamy <clamy@chromium.org>
> Commit-Queue: Arthur Sonzogni <arthursonzogni@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#800081}

TBR=clamy@chromium.org,arthursonzogni@chromium.org

Change-Id: I6b733083ad41e0f1b99c39435c17c558987271bf
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 1119555, 1120212
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2368078Reviewed-by: default avatarWei-Yin Chen (陳威尹) <wychen@chromium.org>
Commit-Queue: Wei-Yin Chen (陳威尹) <wychen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#800451}
parent 41f682d5
...@@ -1908,19 +1908,8 @@ class CoopReportingOriginTrialBrowserTest : public ContentBrowserTest { ...@@ -1908,19 +1908,8 @@ class CoopReportingOriginTrialBrowserTest : public ContentBrowserTest {
// Origin Trials key generated with: // Origin Trials key generated with:
// //
// tools/origin_trials/generate_token.py https://coop.security:9999 // tools/origin_trials/generate_token.py --expire-days 5000 --version 3
// CrossOriginOpenerPolicyReporting --version=3 --expire-timestamp=2029708007 // https://coop.security:9999 CrossOriginOpenerPolicyReporting
//
// Token details:
// Version: 3
// Origin: https://coop.security:9999
// Is Subdomain: None
// Is Third Party: None
// Usage Restriction: None
// Feature: CrossOriginOpenerPolicyReporting
// Expiry: 2029708007 (2034-04-26 23:46:47 UTC)
// Signature (Base64): lTh1cb2ViGEtK6YOZc05uu3nEnRdWlJ/D/Dur4xjM7OI2cd9yXVlK
// GMqN5zIRzcTm8O0dX7CIsxuq6QvCGzyAg==
static std::string OriginTrialToken() { static std::string OriginTrialToken() {
return "A5U4dXG9lYhhLSumDmXNObrt5xJ0XVpSfw/" return "A5U4dXG9lYhhLSumDmXNObrt5xJ0XVpSfw/"
"w7q+MYzOziNnHfcl1ZShjKjecyEc3E5vDtHV+" "w7q+MYzOziNnHfcl1ZShjKjecyEc3E5vDtHV+"
...@@ -1962,13 +1951,6 @@ class CoopReportingOriginTrialBrowserTest : public ContentBrowserTest { ...@@ -1962,13 +1951,6 @@ class CoopReportingOriginTrialBrowserTest : public ContentBrowserTest {
void SetUpCommandLine(base::CommandLine* command_line) final { void SetUpCommandLine(base::CommandLine* command_line) final {
ContentBrowserTest::SetUpCommandLine(command_line); ContentBrowserTest::SetUpCommandLine(command_line);
command_line->AppendSwitch(switches::kIgnoreCertificateErrors); command_line->AppendSwitch(switches::kIgnoreCertificateErrors);
// TODO(https://crbug.com/1119555): Remove this once fixed.
// This test relies on the origin-trial's public key to continue to be set
// to the default test value. Overriding it would break the test.
CHECK(!command_line->HasSwitch("origin-trial-public-key") ||
command_line->GetSwitchValueASCII("origin-trial-public-key") ==
"dRCs+TocuKkocNKa0AtZ4awrt9XKH2SQCI6o4FY6BNA=");
} }
private: private:
...@@ -2006,8 +1988,9 @@ IN_PROC_BROWSER_TEST_F(CoopReportingOriginTrialBrowserTest, ...@@ -2006,8 +1988,9 @@ IN_PROC_BROWSER_TEST_F(CoopReportingOriginTrialBrowserTest,
network::mojom::CrossOriginOpenerPolicyValue::kUnsafeNone); network::mojom::CrossOriginOpenerPolicyValue::kUnsafeNone);
} }
// TODO(http://crbug.com/1119555): Flaky on android-bfcache-rel.
IN_PROC_BROWSER_TEST_F(CoopReportingOriginTrialBrowserTest, IN_PROC_BROWSER_TEST_F(CoopReportingOriginTrialBrowserTest,
CoopStateWithToken) { DISABLED_CoopStateWithToken) {
URLLoaderInterceptor interceptor(base::BindLambdaForTesting( URLLoaderInterceptor interceptor(base::BindLambdaForTesting(
[&](URLLoaderInterceptor::RequestParams* params) { [&](URLLoaderInterceptor::RequestParams* params) {
if (params->url_request.url != OriginTrialURL()) if (params->url_request.url != OriginTrialURL())
...@@ -2035,8 +2018,9 @@ IN_PROC_BROWSER_TEST_F(CoopReportingOriginTrialBrowserTest, ...@@ -2035,8 +2018,9 @@ IN_PROC_BROWSER_TEST_F(CoopReportingOriginTrialBrowserTest,
network::mojom::CrossOriginOpenerPolicyValue::kSameOriginPlusCoep); network::mojom::CrossOriginOpenerPolicyValue::kSameOriginPlusCoep);
} }
// TODO(http://crbug.com/1119555): Flaky on android-bfcache-rel.
IN_PROC_BROWSER_TEST_F(CoopReportingOriginTrialBrowserTest, IN_PROC_BROWSER_TEST_F(CoopReportingOriginTrialBrowserTest,
AccessReportingWithoutToken) { DISABLED_AccessReportingWithoutToken) {
URLLoaderInterceptor interceptor(base::BindLambdaForTesting( URLLoaderInterceptor interceptor(base::BindLambdaForTesting(
[&](URLLoaderInterceptor::RequestParams* params) { [&](URLLoaderInterceptor::RequestParams* params) {
if (params->url_request.url != OriginTrialURL()) if (params->url_request.url != OriginTrialURL())
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment