Commit 8986879b authored by Cammie Smith Barnes's avatar Cammie Smith Barnes Committed by Commit Bot

Ad metrics: Re-enable CreativeOrigin*Browser* tests that were flaky.

Flakiness may have been fixed by
https://chromium-review.googlesource.com/c/chromium/src/+/2290775.
Re-enable and monitor tests for any signs of further flakiness.

Bug: 1098373
Change-Id: I3bb147b3b5fd7a1ec8fd17d99e5db44008278c80
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2391722Reviewed-by: default avatarJosh Karlin <jkarlin@chromium.org>
Commit-Queue: Cammie Smith Barnes <cammie@chromium.org>
Cr-Commit-Position: refs/heads/master@{#810661}
parent fff21a12
......@@ -712,11 +712,10 @@ IN_PROC_BROWSER_TEST_F(CreativeOriginAdsPageLoadMetricsObserverBrowserTest,
OriginStatusWithThrottling::kUnknownAndUnthrottled);
}
// Flakily fails (crbug.com/1099758)
// Test that a throttled ad with a different origin as the main page is
// marked as throttled, with indeterminate creative origin status.
IN_PROC_BROWSER_TEST_F(CreativeOriginAdsPageLoadMetricsObserverBrowserTest,
DISABLED_CreativeOriginStatusWithThrottlingUnknown) {
CreativeOriginStatusWithThrottlingUnknown) {
TestCreativeOriginStatus(
MakeFrame("a",
MakeFrame("b", MakeFrame("c", nullptr), true /* has_text */,
......@@ -738,15 +737,13 @@ IN_PROC_BROWSER_TEST_F(CreativeOriginAdsPageLoadMetricsObserverBrowserTest,
OriginStatus::kUnknown, OriginStatusWithThrottling::kUnknownAndThrottled);
}
// Flakily fails. https://crbug.com/1099545
// Test that an ad creative with a different origin as the main page,
// but nested in a same-origin root ad frame, such that its root ad frame
// is outside the main frame but not throttled (because the root is
// same-origin), will be marked as having unknown creative origin status
// (since there will be no FCP) and being unthrottled.
IN_PROC_BROWSER_TEST_F(
CreativeOriginAdsPageLoadMetricsObserverBrowserTest,
DISABLED_CreativeOriginStatusWithThrottlingNestedUnthrottled) {
IN_PROC_BROWSER_TEST_F(CreativeOriginAdsPageLoadMetricsObserverBrowserTest,
CreativeOriginStatusWithThrottlingNestedUnthrottled) {
TestCreativeOriginStatus(
MakeFrame(
"a",
......
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