Index: chrome/browser/page_load_metrics/observers/ads_page_load_metrics_observer_unittest.cc |
diff --git a/chrome/browser/page_load_metrics/observers/ads_page_load_metrics_observer_unittest.cc b/chrome/browser/page_load_metrics/observers/ads_page_load_metrics_observer_unittest.cc |
index 73b94614556b90c17a28184c6b649e852b7f8162..5ca52b43eafaaa7ecd5ff91f75670199c3aa461a 100644 |
--- a/chrome/browser/page_load_metrics/observers/ads_page_load_metrics_observer_unittest.cc |
+++ b/chrome/browser/page_load_metrics/observers/ads_page_load_metrics_observer_unittest.cc |
@@ -5,10 +5,13 @@ |
#include "chrome/browser/page_load_metrics/observers/ads_page_load_metrics_observer.h" |
#include <string> |
+#include <utility> |
+#include <vector> |
#include "base/macros.h" |
#include "base/strings/stringprintf.h" |
#include "base/test/histogram_tester.h" |
+#include "chrome/browser/page_load_metrics/ads_detection.h" |
#include "chrome/browser/page_load_metrics/metrics_web_contents_observer.h" |
#include "chrome/browser/page_load_metrics/observers/page_load_metrics_observer_test_harness.h" |
#include "chrome/browser/page_load_metrics/page_load_metrics_observer.h" |
@@ -39,7 +42,6 @@ struct ExpectedFrameBytes { |
size_t uncached_kb; |
}; |
-enum class AdType { GOOGLE = 0, SUBRESOURCE_FILTER = 1, ALL = 2 }; |
enum class ResourceCached { NOT_CACHED, CACHED }; |
enum class FrameType { AD = 0, NON_AD }; |
@@ -126,11 +128,11 @@ class DelayWillProcessResponseObserver : public content::WebContentsObserver { |
std::string AdTypeToString(AdType ad_type) { |
switch (ad_type) { |
- case AdType::GOOGLE: |
+ case AD_TYPE_GOOGLE: |
return "Google"; |
- case AdType::SUBRESOURCE_FILTER: |
+ case AD_TYPE_SUBRESOURCE_FILTER: |
return "SubresourceFilter"; |
- case AdType::ALL: |
+ case AD_TYPE_ALL: |
return "All"; |
} |
ADD_FAILURE(); |
@@ -352,7 +354,7 @@ TEST_F(AdsPageLoadMetricsObserverTest, PageWithNoAds) { |
TestHistograms(histogram_tester(), std::vector<ExpectedFrameBytes>(), |
0 /* non_ad_cached_kb */, 30 /* non_ad_uncached_kb */, |
- AdType::GOOGLE); |
+ AD_TYPE_GOOGLE); |
// Verify that other UMA wasn't written. |
histogram_tester().ExpectTotalCount( |
@@ -381,7 +383,7 @@ TEST_F(AdsPageLoadMetricsObserverTest, ResourceBeforeAdFrameCommits) { |
NavigateFrame(kNonAdUrl, main_frame); |
TestHistograms(histogram_tester(), {{0, 10}}, 0 /* non_ad_cached_kb */, |
- 10 /*non_ad_uncached_kb*/, AdType::GOOGLE); |
+ 10 /*non_ad_uncached_kb*/, AD_TYPE_GOOGLE); |
} |
TEST_F(AdsPageLoadMetricsObserverTest, AllAdTypesInPage) { |
@@ -430,13 +432,13 @@ TEST_F(AdsPageLoadMetricsObserverTest, AllAdTypesInPage) { |
TestHistograms(histogram_tester(), {{10, 0}, {0, 10}}, |
30 /* non_ad_cached_kb */, 30 /* non_ad_uncached_kb */, |
- AdType::GOOGLE); |
+ AD_TYPE_GOOGLE); |
TestHistograms(histogram_tester(), {{0, 10}, {10, 10}}, |
30 /* non_ad_cached_kb */, 20 /* non_ad_uncached_kb */, |
- AdType::SUBRESOURCE_FILTER); |
+ AD_TYPE_SUBRESOURCE_FILTER); |
TestHistograms(histogram_tester(), {{10, 0}, {0, 10}, {0, 10}, {10, 10}}, |
20 /* non_ad_cached_kb */, 10 /* non_ad_uncached_kb */, |
- AdType::ALL); |
+ AD_TYPE_ALL); |
histogram_tester().ExpectBucketCount( |
"PageLoad.Clients.Ads.All.ParentExistsForSubFrame", 0, 0); |
histogram_tester().ExpectTotalCount( |
@@ -499,7 +501,7 @@ TEST_F(AdsPageLoadMetricsObserverTest, PageWithAdFrameThatRenavigates) { |
NavigateFrame(kNonAdUrl, main_frame); |
TestHistograms(histogram_tester(), {{0, 20}}, 0 /* non_ad_cached_kb */, |
- 10 /* non_ad_uncached_kb */, AdType::GOOGLE); |
+ 10 /* non_ad_uncached_kb */, AD_TYPE_GOOGLE); |
histogram_tester().ExpectBucketCount( |
"PageLoad.Clients.Ads.All.ParentExistsForSubFrame", 0, 0); |
histogram_tester().ExpectTotalCount( |
@@ -535,7 +537,7 @@ TEST_F(AdsPageLoadMetricsObserverTest, PageWithNonAdFrameThatRenavigatesToAd) { |
TestHistograms(histogram_tester(), {{0, 10}, {0, 10}}, |
0 /* non_ad_cached_kb */, 20 /* non_ad_uncached_kb */, |
- AdType::GOOGLE); |
+ AD_TYPE_GOOGLE); |
histogram_tester().ExpectBucketCount( |
"PageLoad.Clients.Ads.All.ParentExistsForSubFrame", 0, 0); |
histogram_tester().ExpectTotalCount( |
@@ -566,7 +568,7 @@ TEST_F(AdsPageLoadMetricsObserverTest, CountAbortedNavigation) { |
NavigateFrame(kNonAdUrl, main_frame); |
TestHistograms(histogram_tester(), {{0, 20}}, 0 /* non_ad_cached_kb */, |
- 10 /* non_ad_uncached_kb */, AdType::GOOGLE); |
+ 10 /* non_ad_uncached_kb */, AD_TYPE_GOOGLE); |
} |
TEST_F(AdsPageLoadMetricsObserverTest, CountAbortedSecondNavigationForFrame) { |
@@ -595,7 +597,7 @@ TEST_F(AdsPageLoadMetricsObserverTest, CountAbortedSecondNavigationForFrame) { |
NavigateFrame(kNonAdUrl, main_frame); |
TestHistograms(histogram_tester(), {{0, 20}}, 0 /* non_ad_cached_kb */, |
- 20 /* non_ad_uncached_kb */, AdType::GOOGLE); |
+ 20 /* non_ad_uncached_kb */, AD_TYPE_GOOGLE); |
} |
TEST_F(AdsPageLoadMetricsObserverTest, TwoResourceLoadsBeforeCommit) { |
@@ -630,7 +632,7 @@ TEST_F(AdsPageLoadMetricsObserverTest, TwoResourceLoadsBeforeCommit) { |
NavigateFrame(kNonAdUrl, main_frame); |
TestHistograms(histogram_tester(), {{0, 20}}, 0 /* non_ad_cached_kb */, |
- 10 /* non_ad_uncached_kb */, AdType::GOOGLE); |
+ 10 /* non_ad_uncached_kb */, AD_TYPE_GOOGLE); |
histogram_tester().ExpectBucketCount( |
"PageLoad.Clients.Ads.All.ParentExistsForSubFrame", 0, 0); |
histogram_tester().ExpectUniqueSample( |