Commit dfed7534 authored by Kenichi Ishibashi's avatar Kenichi Ishibashi Committed by Commit Bot

S13nSW: Fix ServiceWorkerMetricsTest.ActivatedWorkerPreparation

As a comment in
ServiceWorkerMetrics::RecordActivatedWorkerPreparationForMainFrame()
says[1], we don't record .Time histograms. Skip checks for these
histograms when S13nServiceWorker is enabled.

[1] https://cs.chromium.org/chromium/src/content/browser/service_worker/service_worker_metrics.cc?l=508&rcl=c796dbc93b6490e94e9b843b1e0ecee3e115d2a3

Bug: 860361
Change-Id: Id0d153eab1e7c7a7102c01bf1945f4b8536b2d9f
Reviewed-on: https://chromium-review.googlesource.com/1143047Reviewed-by: default avatarMatt Falkenhagen <falken@chromium.org>
Commit-Queue: Kenichi Ishibashi <bashi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#576390}
parent daaa437f
......@@ -8,6 +8,7 @@
#include "content/browser/service_worker/embedded_worker_status.h"
#include "content/test/test_content_browser_client.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/blink/public/common/service_worker/service_worker_utils.h"
namespace content {
......@@ -96,11 +97,15 @@ TEST(ServiceWorkerMetricsTest, ActivatedWorkerPreparation) {
kPreparationType, static_cast<int>(WorkerPreparationType::STARTING), 1);
histogram_tester.ExpectTotalCount(
kPreparationType + kNavigationPreloadSuffix, 0);
histogram_tester.ExpectTimeBucketCount(kPreparationTime, time, 1);
histogram_tester.ExpectTimeBucketCount(kPreparationTime + "_StartingWorker",
time, 1);
histogram_tester.ExpectTotalCount(
kPreparationTime + kNavigationPreloadSuffix, 0);
// We don't record .Time histograms when S13nServiceWorker is enabled.
if (!blink::ServiceWorkerUtils::IsServicificationEnabled()) {
histogram_tester.ExpectTimeBucketCount(kPreparationTime, time, 1);
histogram_tester.ExpectTimeBucketCount(
kPreparationTime + "_StartingWorker", time, 1);
histogram_tester.ExpectTotalCount(
kPreparationTime + kNavigationPreloadSuffix, 0);
}
}
{
......@@ -115,11 +120,16 @@ TEST(ServiceWorkerMetricsTest, ActivatedWorkerPreparation) {
histogram_tester.ExpectUniqueSample(
kPreparationType + kNavigationPreloadSuffix,
static_cast<int>(WorkerPreparationType::START_DURING_STARTUP), 1);
histogram_tester.ExpectTimeBucketCount(kPreparationTime, time, 1);
histogram_tester.ExpectTimeBucketCount(
kPreparationTime + kNavigationPreloadSuffix, time, 1);
histogram_tester.ExpectTotalCount(
kPreparationTime + kWorkerStartOccurred + kNavigationPreloadSuffix, 1);
// We don't record .Time histograms when S13nServiceWorker is enabled.
if (!blink::ServiceWorkerUtils::IsServicificationEnabled()) {
histogram_tester.ExpectTimeBucketCount(kPreparationTime, time, 1);
histogram_tester.ExpectTimeBucketCount(
kPreparationTime + kNavigationPreloadSuffix, time, 1);
histogram_tester.ExpectTotalCount(
kPreparationTime + kWorkerStartOccurred + kNavigationPreloadSuffix,
1);
}
}
{
......@@ -139,12 +149,16 @@ TEST(ServiceWorkerMetricsTest, ActivatedWorkerPreparation) {
static_cast<int>(
WorkerPreparationType::START_IN_EXISTING_READY_PROCESS),
1);
histogram_tester.ExpectTimeBucketCount(kPreparationTime, time, 1);
histogram_tester.ExpectTimeBucketCount(
kPreparationTime + kNavigationPreloadSuffix, time, 1);
histogram_tester.ExpectTimeBucketCount(
kPreparationTime + kWorkerStartOccurred + kNavigationPreloadSuffix,
time, 1);
// We don't record .Time histograms when S13nServiceWorker is enabled.
if (!blink::ServiceWorkerUtils::IsServicificationEnabled()) {
histogram_tester.ExpectTimeBucketCount(kPreparationTime, time, 1);
histogram_tester.ExpectTimeBucketCount(
kPreparationTime + kNavigationPreloadSuffix, time, 1);
histogram_tester.ExpectTimeBucketCount(
kPreparationTime + kWorkerStartOccurred + kNavigationPreloadSuffix,
time, 1);
}
}
// Suffixed metric test.
......
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