Skip to content

GitLab

T
tangled
Commit de7284e4 authored by Robert Ogden's avatar Robert Ogden Committed by Commit Bot
Browse files
Options

Cleanup navigation restart metrics in previews 

This got missed in the original cleanup.

Change-Id: Iaa48d54b78c18648c8a24d79cb9b3679a4e573fd
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1988722Reviewed-by: default avatarRyan Sturm <ryansturm@chromium.org>
Reviewed-by: default avatarSteven Holte <holte@chromium.org>
Commit-Queue: Robert Ogden <robertogden@chromium.org>
Cr-Commit-Position: refs/heads/master@{#731853}
parent 0a94f000
Hide whitespace changes
Inline Side-by-side
Showing with 67 additions and 171 deletions
chrome/browser/page_load_metrics/observers/previews_ukm_observer.cc
View file @ de7284e4
...@@ -118,11 +118,6 @@ PreviewsUKMObserver::OnCommit(content::NavigationHandle* navigation_handle, ...@@ -118,11 +118,6 @@ PreviewsUKMObserver::OnCommit(content::NavigationHandle* navigation_handle,
if (previews_user_data->cache_control_no_transform_directive()) { if (previews_user_data->cache_control_no_transform_directive()) {
origin_opt_out_occurred_ = true; origin_opt_out_occurred_ = true;
} }
if (previews_user_data->server_lite_page_info()) {
navigation_restart_penalty_ =
navigation_handle->NavigationStart() -
previews_user_data->server_lite_page_info()->original_navigation_start;
}
lite_page_eligibility_reason_ = lite_page_eligibility_reason_ =
previews_user_data->EligibilityReasonForPreview( previews_user_data->EligibilityReasonForPreview(
...@@ -202,13 +197,10 @@ void PreviewsUKMObserver::RecordPreviewsTypes() { ...@@ -202,13 +197,10 @@ void PreviewsUKMObserver::RecordPreviewsTypes() {
page_load_metrics::PageEndReason::PAGE_END_REASON_COUNT); page_load_metrics::PageEndReason::PAGE_END_REASON_COUNT);
// Only record previews types when they are active. // Only record previews types when they are active.
// |navigation_restart_penalty_| is included here because a Lite Page Redirect
// preview can be attempted and not commit. This incurs the penalty but may
// also cause no preview to be committed.
if (!lite_page_seen_ && !noscript_seen_ && !resource_loading_hints_seen_ && if (!lite_page_seen_ && !noscript_seen_ && !resource_loading_hints_seen_ &&
!defer_all_script_seen_ && !offline_preview_seen_ && !defer_all_script_seen_ && !offline_preview_seen_ &&
!origin_opt_out_occurred_ && !save_data_enabled_ && !origin_opt_out_occurred_ && !save_data_enabled_ &&
!lite_page_redirect_seen_ && !navigation_restart_penalty_.has_value()) { !lite_page_redirect_seen_) {
return; return;
} }
...@@ -235,10 +227,6 @@ void PreviewsUKMObserver::RecordPreviewsTypes() { ...@@ -235,10 +227,6 @@ void PreviewsUKMObserver::RecordPreviewsTypes() {
builder.Setsave_data_enabled(1); builder.Setsave_data_enabled(1);
if (previews_likely_) if (previews_likely_)
builder.Setpreviews_likely(1); builder.Setpreviews_likely(1);
if (navigation_restart_penalty_.has_value()) {
builder.Setnavigation_restart_penalty(
navigation_restart_penalty_->InMilliseconds());
}
if (ShouldOptionalEligibilityReasonBeRecorded( if (ShouldOptionalEligibilityReasonBeRecorded(
lite_page_eligibility_reason_)) { lite_page_eligibility_reason_)) {
......
chrome/browser/page_load_metrics/observers/previews_ukm_observer.h
View file @ de7284e4
...@@ -82,7 +82,6 @@ class PreviewsUKMObserver : public page_load_metrics::PageLoadMetricsObserver { ...@@ -82,7 +82,6 @@ class PreviewsUKMObserver : public page_load_metrics::PageLoadMetricsObserver {
defer_all_script_eligibility_reason_; defer_all_script_eligibility_reason_;
base::Optional<previews::PreviewsEligibilityReason> base::Optional<previews::PreviewsEligibilityReason>
offline_eligibility_reason_; offline_eligibility_reason_;
base::Optional<base::TimeDelta> navigation_restart_penalty_;
SEQUENCE_CHECKER(sequence_checker_); SEQUENCE_CHECKER(sequence_checker_);
......
chrome/browser/page_load_metrics/observers/previews_ukm_observer_unittest.cc
View file @ de7284e4
...@@ -49,14 +49,12 @@ class TestPreviewsUKMObserver : public PreviewsUKMObserver { ...@@ -49,14 +49,12 @@ class TestPreviewsUKMObserver : public PreviewsUKMObserver {
bool origin_opt_out_received, bool origin_opt_out_received,
bool save_data_enabled, bool save_data_enabled,
std::unordered_map<PreviewsType, PreviewsEligibilityReason> std::unordered_map<PreviewsType, PreviewsEligibilityReason>
eligibility_reasons, eligibility_reasons)
base::Optional<base::TimeDelta> navigation_restart_penalty)
: committed_state_(committed_state), : committed_state_(committed_state),
allowed_state_(allowed_state), allowed_state_(allowed_state),
origin_opt_out_received_(origin_opt_out_received), origin_opt_out_received_(origin_opt_out_received),
save_data_enabled_(save_data_enabled), save_data_enabled_(save_data_enabled),
eligibility_reasons_(eligibility_reasons), eligibility_reasons_(eligibility_reasons) {}
navigation_restart_penalty_(navigation_restart_penalty) {}
~TestPreviewsUKMObserver() override {} ~TestPreviewsUKMObserver() override {}
...@@ -74,14 +72,6 @@ class TestPreviewsUKMObserver : public PreviewsUKMObserver { ...@@ -74,14 +72,6 @@ class TestPreviewsUKMObserver : public PreviewsUKMObserver {
user_data->SetCommittedPreviewsTypeForTesting( user_data->SetCommittedPreviewsTypeForTesting(
previews::GetMainFramePreviewsType(committed_state_)); previews::GetMainFramePreviewsType(committed_state_));
if (navigation_restart_penalty_.has_value()) {
user_data->set_server_lite_page_info(
std::make_unique<previews::PreviewsUserData::ServerLitePageInfo>());
user_data->server_lite_page_info()->original_navigation_start =
navigation_handle->NavigationStart() -
navigation_restart_penalty_.value();
}
if (origin_opt_out_received_) { if (origin_opt_out_received_) {
user_data->set_cache_control_no_transform_directive(); user_data->set_cache_control_no_transform_directive();
} }
...@@ -110,7 +100,6 @@ class TestPreviewsUKMObserver : public PreviewsUKMObserver { ...@@ -110,7 +100,6 @@ class TestPreviewsUKMObserver : public PreviewsUKMObserver {
const bool save_data_enabled_; const bool save_data_enabled_;
std::unordered_map<PreviewsType, PreviewsEligibilityReason> std::unordered_map<PreviewsType, PreviewsEligibilityReason>
eligibility_reasons_; eligibility_reasons_;
base::Optional<base::TimeDelta> navigation_restart_penalty_;
DISALLOW_COPY_AND_ASSIGN(TestPreviewsUKMObserver); DISALLOW_COPY_AND_ASSIGN(TestPreviewsUKMObserver);
}; };
...@@ -126,14 +115,12 @@ class PreviewsUKMObserverTest ...@@ -126,14 +115,12 @@ class PreviewsUKMObserverTest
bool origin_opt_out, bool origin_opt_out,
bool save_data_enabled, bool save_data_enabled,
std::unordered_map<PreviewsType, PreviewsEligibilityReason> std::unordered_map<PreviewsType, PreviewsEligibilityReason>
eligibility_reasons, eligibility_reasons) {
base::Optional<base::TimeDelta> navigation_restart_penalty) {
committed_state_ = committed_state; committed_state_ = committed_state;
allowed_state_ = allowed_state; allowed_state_ = allowed_state;
origin_opt_out_ = origin_opt_out; origin_opt_out_ = origin_opt_out;
save_data_enabled_ = save_data_enabled; save_data_enabled_ = save_data_enabled;
eligibility_reasons_ = eligibility_reasons; eligibility_reasons_ = eligibility_reasons;
navigation_restart_penalty_ = navigation_restart_penalty;
auto navigation = content::NavigationSimulator::CreateBrowserInitiated( auto navigation = content::NavigationSimulator::CreateBrowserInitiated(
GURL(kDefaultTestUrl), web_contents()); GURL(kDefaultTestUrl), web_contents());
if (committed_state == content::OFFLINE_PAGE_ON) if (committed_state == content::OFFLINE_PAGE_ON)
...@@ -149,14 +136,13 @@ class PreviewsUKMObserverTest ...@@ -149,14 +136,13 @@ class PreviewsUKMObserverTest
bool save_data_enabled_expected, bool save_data_enabled_expected,
bool previews_likely_expected, bool previews_likely_expected,
std::unordered_map<PreviewsType, PreviewsEligibilityReason> std::unordered_map<PreviewsType, PreviewsEligibilityReason>
eligibility_reasons, eligibility_reasons) {
base::Optional<base::TimeDelta> navigation_restart_penalty) {
using UkmEntry = ukm::builders::Previews; using UkmEntry = ukm::builders::Previews;
auto entries = auto entries =
tester()->test_ukm_recorder().GetEntriesByName(UkmEntry::kEntryName); tester()->test_ukm_recorder().GetEntriesByName(UkmEntry::kEntryName);
if (expected_recorded_previews == 0 && opt_out_value == 0 && if (expected_recorded_previews == 0 && opt_out_value == 0 &&
!origin_opt_out_expected && !save_data_enabled_expected && !origin_opt_out_expected && !save_data_enabled_expected &&
!previews_likely_expected && !navigation_restart_penalty.has_value()) { !previews_likely_expected) {
EXPECT_EQ(0u, entries.size()); EXPECT_EQ(0u, entries.size());
return; return;
} }
...@@ -205,11 +191,6 @@ class PreviewsUKMObserverTest ...@@ -205,11 +191,6 @@ class PreviewsUKMObserverTest
EXPECT_EQ(previews_likely_expected, EXPECT_EQ(previews_likely_expected,
tester()->test_ukm_recorder().EntryHasMetric( tester()->test_ukm_recorder().EntryHasMetric(
entry, UkmEntry::kpreviews_likelyName)); entry, UkmEntry::kpreviews_likelyName));
if (navigation_restart_penalty.has_value()) {
tester()->test_ukm_recorder().ExpectEntryMetric(
entry, UkmEntry::knavigation_restart_penaltyName,
navigation_restart_penalty.value().InMilliseconds());
}
int want_lite_page_eligibility_reason = int want_lite_page_eligibility_reason =
static_cast<int>(eligibility_reasons[PreviewsType::LITE_PAGE]); static_cast<int>(eligibility_reasons[PreviewsType::LITE_PAGE]);
...@@ -276,13 +257,12 @@ class PreviewsUKMObserverTest ...@@ -276,13 +257,12 @@ class PreviewsUKMObserverTest
void RegisterObservers(page_load_metrics::PageLoadTracker* tracker) override { void RegisterObservers(page_load_metrics::PageLoadTracker* tracker) override {
tracker->AddObserver(std::make_unique<TestPreviewsUKMObserver>( tracker->AddObserver(std::make_unique<TestPreviewsUKMObserver>(
committed_state_, allowed_state_, origin_opt_out_, save_data_enabled_, committed_state_, allowed_state_, origin_opt_out_, save_data_enabled_,
eligibility_reasons_, navigation_restart_penalty_)); eligibility_reasons_));
// Data is only added to the first navigation after RunTest(). // Data is only added to the first navigation after RunTest().
committed_state_ = content::PREVIEWS_OFF; committed_state_ = content::PREVIEWS_OFF;
allowed_state_ = content::PREVIEWS_OFF; allowed_state_ = content::PREVIEWS_OFF;
origin_opt_out_ = false; origin_opt_out_ = false;
eligibility_reasons_.clear(); eligibility_reasons_.clear();
navigation_restart_penalty_ = base::nullopt;
} }
private: private:
...@@ -292,7 +272,6 @@ class PreviewsUKMObserverTest ...@@ -292,7 +272,6 @@ class PreviewsUKMObserverTest
bool save_data_enabled_ = false; bool save_data_enabled_ = false;
std::unordered_map<PreviewsType, PreviewsEligibilityReason> std::unordered_map<PreviewsType, PreviewsEligibilityReason>
eligibility_reasons_ = {}; eligibility_reasons_ = {};
base::Optional<base::TimeDelta> navigation_restart_penalty_ = base::nullopt;
DISALLOW_COPY_AND_ASSIGN(PreviewsUKMObserverTest); DISALLOW_COPY_AND_ASSIGN(PreviewsUKMObserverTest);
}; };
...@@ -301,23 +280,21 @@ TEST_F(PreviewsUKMObserverTest, NoPreviewSeen) { ...@@ -301,23 +280,21 @@ TEST_F(PreviewsUKMObserverTest, NoPreviewSeen) {
RunTest(content::PREVIEWS_OFF /* committed_state */, RunTest(content::PREVIEWS_OFF /* committed_state */,
content::PREVIEWS_UNSPECIFIED /* allowed_state */, content::PREVIEWS_UNSPECIFIED /* allowed_state */,
false /* origin_opt_out */, false /* save_data_enabled */, false /* origin_opt_out */, false /* save_data_enabled */,
{} /* eligibility_reasons */, {} /* eligibility_reasons */);
base::nullopt /* navigation_restart_penalty */);
tester()->NavigateToUntrackedUrl(); tester()->NavigateToUntrackedUrl();
ValidatePreviewsUKM(content::PREVIEWS_UNSPECIFIED, 0 /* opt_out_value */, ValidatePreviewsUKM(content::PREVIEWS_UNSPECIFIED, 0 /* opt_out_value */,
false /* origin_opt_out_expected */, false /* origin_opt_out_expected */,
false /* save_data_enabled_expected */, false /* save_data_enabled_expected */,
false /* previews_likely */, {} /* eligibility_reasons */, false /* previews_likely */,
base::nullopt /* navigation_restart_penalty */); {} /* eligibility_reasons */);
} }
TEST_F(PreviewsUKMObserverTest, UntrackedPreviewTypeOptOut) { TEST_F(PreviewsUKMObserverTest, UntrackedPreviewTypeOptOut) {
RunTest(content::PREVIEWS_OFF /* committed_state */, RunTest(content::PREVIEWS_OFF /* committed_state */,
content::PREVIEWS_UNSPECIFIED /* allowed_state */, content::PREVIEWS_UNSPECIFIED /* allowed_state */,
false /* origin_opt_out */, false /* save_data_enabled */, false /* origin_opt_out */, false /* save_data_enabled */,
{} /* eligibility_reasons */, {} /* eligibility_reasons */);
base::nullopt /* navigation_restart_penalty */);
tester()->metrics_web_contents_observer()->BroadcastEventToObservers( tester()->metrics_web_contents_observer()->BroadcastEventToObservers(
PreviewsUITabHelper::OptOutEventKey()); PreviewsUITabHelper::OptOutEventKey());
tester()->NavigateToUntrackedUrl(); tester()->NavigateToUntrackedUrl();
...@@ -326,8 +303,8 @@ TEST_F(PreviewsUKMObserverTest, UntrackedPreviewTypeOptOut) { ...@@ -326,8 +303,8 @@ TEST_F(PreviewsUKMObserverTest, UntrackedPreviewTypeOptOut) {
ValidatePreviewsUKM(content::PREVIEWS_UNSPECIFIED, 0 /* opt_out_value */, ValidatePreviewsUKM(content::PREVIEWS_UNSPECIFIED, 0 /* opt_out_value */,
false /* origin_opt_out_expected */, false /* origin_opt_out_expected */,
false /* save_data_enabled_expected */, false /* save_data_enabled_expected */,
false /* previews_likely */, {} /* eligibility_reasons */, false /* previews_likely */,
base::nullopt /* navigation_restart_penalty */); {} /* eligibility_reasons */);
} }
TEST_F(PreviewsUKMObserverTest, LitePageSeen) { TEST_F(PreviewsUKMObserverTest, LitePageSeen) {
...@@ -335,24 +312,21 @@ TEST_F(PreviewsUKMObserverTest, LitePageSeen) { ...@@ -335,24 +312,21 @@ TEST_F(PreviewsUKMObserverTest, LitePageSeen) {
content::SERVER_LITE_PAGE_ON | content::SERVER_LITE_PAGE_ON |
content::DEFER_ALL_SCRIPT_ON /* allowed_state */, content::DEFER_ALL_SCRIPT_ON /* allowed_state */,
false /* origin_opt_out */, false /* save_data_enabled */, false /* origin_opt_out */, false /* save_data_enabled */,
{} /* eligibility_reasons */, {} /* eligibility_reasons */);
base::nullopt /* navigation_restart_penalty */);
tester()->NavigateToUntrackedUrl(); tester()->NavigateToUntrackedUrl();
ValidatePreviewsUKM(content::SERVER_LITE_PAGE_ON, 0 /* opt_out_value */, ValidatePreviewsUKM(content::SERVER_LITE_PAGE_ON, 0 /* opt_out_value */,
false /* origin_opt_out_expected */, false /* origin_opt_out_expected */,
false /* save_data_enabled_expected */, false /* save_data_enabled_expected */,
true /* previews_likely */, {} /* eligibility_reasons */, true /* previews_likely */, {} /* eligibility_reasons */);
base::nullopt /* navigation_restart_penalty */);
} }
TEST_F(PreviewsUKMObserverTest, LitePageOptOutChip) { TEST_F(PreviewsUKMObserverTest, LitePageOptOutChip) {
RunTest(content::SERVER_LITE_PAGE_ON /* committed_state */, RunTest(content::SERVER_LITE_PAGE_ON /* committed_state */,
content::SERVER_LITE_PAGE_ON /* allowed_state */, content::SERVER_LITE_PAGE_ON /* allowed_state */,
false /* origin_opt_out */, false /* save_data_enabled */, false /* origin_opt_out */, false /* save_data_enabled */,
{} /* eligibility_reasons */, {} /* eligibility_reasons */);
base::nullopt /* navigation_restart_penalty */);
tester()->metrics_web_contents_observer()->BroadcastEventToObservers( tester()->metrics_web_contents_observer()->BroadcastEventToObservers(
PreviewsUITabHelper::OptOutEventKey()); PreviewsUITabHelper::OptOutEventKey());
...@@ -361,8 +335,7 @@ TEST_F(PreviewsUKMObserverTest, LitePageOptOutChip) { ...@@ -361,8 +335,7 @@ TEST_F(PreviewsUKMObserverTest, LitePageOptOutChip) {
ValidatePreviewsUKM(content::SERVER_LITE_PAGE_ON, 2 /* opt_out_value */, ValidatePreviewsUKM(content::SERVER_LITE_PAGE_ON, 2 /* opt_out_value */,
false /* origin_opt_out_expected */, false /* origin_opt_out_expected */,
false /* save_data_enabled_expected */, false /* save_data_enabled_expected */,
true /* previews_likely */, {} /* eligibility_reasons */, true /* previews_likely */, {} /* eligibility_reasons */);
base::nullopt /* navigation_restart_penalty */);
} }
TEST_F(PreviewsUKMObserverTest, LitePageRedirectSeen) { TEST_F(PreviewsUKMObserverTest, LitePageRedirectSeen) {
...@@ -370,24 +343,21 @@ TEST_F(PreviewsUKMObserverTest, LitePageRedirectSeen) { ...@@ -370,24 +343,21 @@ TEST_F(PreviewsUKMObserverTest, LitePageRedirectSeen) {
content::LITE_PAGE_REDIRECT_ON | content::LITE_PAGE_REDIRECT_ON |
content::OFFLINE_PAGE_ON /* allowed_state */, content::OFFLINE_PAGE_ON /* allowed_state */,
false /* origin_opt_out */, false /* save_data_enabled */, false /* origin_opt_out */, false /* save_data_enabled */,
{} /* eligibility_reasons */, {} /* eligibility_reasons */);
base::nullopt /* navigation_restart_penalty */);
tester()->NavigateToUntrackedUrl(); tester()->NavigateToUntrackedUrl();
ValidatePreviewsUKM(content::LITE_PAGE_REDIRECT_ON, 0 /* opt_out_value */, ValidatePreviewsUKM(content::LITE_PAGE_REDIRECT_ON, 0 /* opt_out_value */,
false /* origin_opt_out_expected */, false /* origin_opt_out_expected */,
false /* save_data_enabled_expected */, false /* save_data_enabled_expected */,
true /* previews_likely */, {} /* eligibility_reasons */, true /* previews_likely */, {} /* eligibility_reasons */);
base::nullopt /* navigation_restart_penalty */);
} }
TEST_F(PreviewsUKMObserverTest, LitePageRedirectOptOutChip) { TEST_F(PreviewsUKMObserverTest, LitePageRedirectOptOutChip) {
RunTest(content::LITE_PAGE_REDIRECT_ON /* committed_state */, RunTest(content::LITE_PAGE_REDIRECT_ON /* committed_state */,
content::LITE_PAGE_REDIRECT_ON /* allowed_state */, content::LITE_PAGE_REDIRECT_ON /* allowed_state */,
false /* origin_opt_out */, false /* save_data_enabled */, false /* origin_opt_out */, false /* save_data_enabled */,
{} /* eligibility_reasons */, {} /* eligibility_reasons */);
base::nullopt /* navigation_restart_penalty */);
tester()->metrics_web_contents_observer()->BroadcastEventToObservers( tester()->metrics_web_contents_observer()->BroadcastEventToObservers(
PreviewsUITabHelper::OptOutEventKey()); PreviewsUITabHelper::OptOutEventKey());
...@@ -396,16 +366,14 @@ TEST_F(PreviewsUKMObserverTest, LitePageRedirectOptOutChip) { ...@@ -396,16 +366,14 @@ TEST_F(PreviewsUKMObserverTest, LitePageRedirectOptOutChip) {
ValidatePreviewsUKM(content::LITE_PAGE_REDIRECT_ON, 2 /* opt_out_value */, ValidatePreviewsUKM(content::LITE_PAGE_REDIRECT_ON, 2 /* opt_out_value */,
false /* origin_opt_out_expected */, false /* origin_opt_out_expected */,
false /* save_data_enabled_expected */, false /* save_data_enabled_expected */,
true /* previews_likely */, {} /* eligibility_reasons */, true /* previews_likely */, {} /* eligibility_reasons */);
base::nullopt /* navigation_restart_penalty */);
} }
TEST_F(PreviewsUKMObserverTest, NoScriptOptOutChip) { TEST_F(PreviewsUKMObserverTest, NoScriptOptOutChip) {
RunTest(content::NOSCRIPT_ON /* committed_state */, RunTest(content::NOSCRIPT_ON /* committed_state */,
content::PREVIEWS_UNSPECIFIED /* allowed_state */, content::PREVIEWS_UNSPECIFIED /* allowed_state */,
false /* origin_opt_out */, false /* save_data_enabled */, false /* origin_opt_out */, false /* save_data_enabled */,
{} /* eligibility_reasons */, {} /* eligibility_reasons */);
base::nullopt /* navigation_restart_penalty */);
tester()->metrics_web_contents_observer()->BroadcastEventToObservers( tester()->metrics_web_contents_observer()->BroadcastEventToObservers(
PreviewsUITabHelper::OptOutEventKey()); PreviewsUITabHelper::OptOutEventKey());
...@@ -414,48 +382,42 @@ TEST_F(PreviewsUKMObserverTest, NoScriptOptOutChip) { ...@@ -414,48 +382,42 @@ TEST_F(PreviewsUKMObserverTest, NoScriptOptOutChip) {
ValidatePreviewsUKM(content::NOSCRIPT_ON, 2 /* opt_out_value */, ValidatePreviewsUKM(content::NOSCRIPT_ON, 2 /* opt_out_value */,
false /* origin_opt_out_expected */, false /* origin_opt_out_expected */,
false /* save_data_enabled_expected */, false /* save_data_enabled_expected */,
true /* previews_likely */, {} /* eligibility_reasons */, true /* previews_likely */, {} /* eligibility_reasons */);
base::nullopt /* navigation_restart_penalty */);
} }
TEST_F(PreviewsUKMObserverTest, OfflinePreviewsSeen) { TEST_F(PreviewsUKMObserverTest, OfflinePreviewsSeen) {
RunTest(content::OFFLINE_PAGE_ON /* committed_state */, RunTest(content::OFFLINE_PAGE_ON /* committed_state */,
content::PREVIEWS_UNSPECIFIED /* allowed_state */, content::PREVIEWS_UNSPECIFIED /* allowed_state */,
false /* origin_opt_out */, false /* save_data_enabled */, false /* origin_opt_out */, false /* save_data_enabled */,
{} /* eligibility_reasons */, {} /* eligibility_reasons */);
base::nullopt /* navigation_restart_penalty */);
tester()->NavigateToUntrackedUrl(); tester()->NavigateToUntrackedUrl();
ValidatePreviewsUKM(content::OFFLINE_PAGE_ON, 0 /* opt_out_value */, ValidatePreviewsUKM(content::OFFLINE_PAGE_ON, 0 /* opt_out_value */,
false /* origin_opt_out_expected */, false /* origin_opt_out_expected */,
false /* save_data_enabled_expected */, false /* save_data_enabled_expected */,
true /* previews_likely */, {} /* eligibility_reasons */, true /* previews_likely */, {} /* eligibility_reasons */);
base::nullopt /* navigation_restart_penalty */);
} }
TEST_F(PreviewsUKMObserverTest, ResourceLoadingHintsSeen) { TEST_F(PreviewsUKMObserverTest, ResourceLoadingHintsSeen) {
RunTest(content::RESOURCE_LOADING_HINTS_ON /* committed_state */, RunTest(content::RESOURCE_LOADING_HINTS_ON /* committed_state */,
content::PREVIEWS_UNSPECIFIED /* allowed_state */, content::PREVIEWS_UNSPECIFIED /* allowed_state */,
false /* origin_opt_out */, false /* save_data_enabled */, false /* origin_opt_out */, false /* save_data_enabled */,
{} /* eligibility_reasons */, {} /* eligibility_reasons */);
base::nullopt /* navigation_restart_penalty */);
tester()->NavigateToUntrackedUrl(); tester()->NavigateToUntrackedUrl();
ValidatePreviewsUKM(content::RESOURCE_LOADING_HINTS_ON, 0 /* opt_out_value */, ValidatePreviewsUKM(content::RESOURCE_LOADING_HINTS_ON, 0 /* opt_out_value */,
false /* origin_opt_out_expected */, false /* origin_opt_out_expected */,
false /* save_data_enabled_expected */, false /* save_data_enabled_expected */,
true /* previews_likely */, {} /* eligibility_reasons */, true /* previews_likely */, {} /* eligibility_reasons */);
base::nullopt /* navigation_restart_penalty */);
} }
TEST_F(PreviewsUKMObserverTest, ResourceLoadingHintsOptOutChip) { TEST_F(PreviewsUKMObserverTest, ResourceLoadingHintsOptOutChip) {
RunTest(content::RESOURCE_LOADING_HINTS_ON /* committed_state */, RunTest(content::RESOURCE_LOADING_HINTS_ON /* committed_state */,
content::PREVIEWS_UNSPECIFIED /* allowed_state */, content::PREVIEWS_UNSPECIFIED /* allowed_state */,
false /* origin_opt_out */, false /* save_data_enabled */, false /* origin_opt_out */, false /* save_data_enabled */,
{} /* eligibility_reasons */, {} /* eligibility_reasons */);
base::nullopt /* navigation_restart_penalty */);
tester()->metrics_web_contents_observer()->BroadcastEventToObservers( tester()->metrics_web_contents_observer()->BroadcastEventToObservers(
PreviewsUITabHelper::OptOutEventKey()); PreviewsUITabHelper::OptOutEventKey());
...@@ -464,32 +426,28 @@ TEST_F(PreviewsUKMObserverTest, ResourceLoadingHintsOptOutChip) { ...@@ -464,32 +426,28 @@ TEST_F(PreviewsUKMObserverTest, ResourceLoadingHintsOptOutChip) {
ValidatePreviewsUKM(content::RESOURCE_LOADING_HINTS_ON, 2 /* opt_out_value */, ValidatePreviewsUKM(content::RESOURCE_LOADING_HINTS_ON, 2 /* opt_out_value */,
false /* origin_opt_out_expected */, false /* origin_opt_out_expected */,
false /* save_data_enabled_expected */, false /* save_data_enabled_expected */,
true /* previews_likely */, {} /* eligibility_reasons */, true /* previews_likely */, {} /* eligibility_reasons */);
base::nullopt /* navigation_restart_penalty */);
} }
TEST_F(PreviewsUKMObserverTest, DeferAllScriptSeen) { TEST_F(PreviewsUKMObserverTest, DeferAllScriptSeen) {
RunTest(content::DEFER_ALL_SCRIPT_ON /* committed_state */, RunTest(content::DEFER_ALL_SCRIPT_ON /* committed_state */,
content::PREVIEWS_UNSPECIFIED /* allowed_state */, content::PREVIEWS_UNSPECIFIED /* allowed_state */,
false /* origin_opt_out */, false /* save_data_enabled */, false /* origin_opt_out */, false /* save_data_enabled */,
{} /* eligibility_reasons */, {} /* eligibility_reasons */);
base::nullopt /* navigation_restart_penalty */);
tester()->NavigateToUntrackedUrl(); tester()->NavigateToUntrackedUrl();
ValidatePreviewsUKM(content::DEFER_ALL_SCRIPT_ON, 0 /* opt_out_value */, ValidatePreviewsUKM(content::DEFER_ALL_SCRIPT_ON, 0 /* opt_out_value */,
false /* origin_opt_out_expected */, false /* origin_opt_out_expected */,
false /* save_data_enabled_expected */, false /* save_data_enabled_expected */,
true /* previews_likely */, {} /* eligibility_reasons */, true /* previews_likely */, {} /* eligibility_reasons */);
base::nullopt /* navigation_restart_penalty */);
} }
TEST_F(PreviewsUKMObserverTest, DeferAllScriptOptOutChip) { TEST_F(PreviewsUKMObserverTest, DeferAllScriptOptOutChip) {
RunTest(content::DEFER_ALL_SCRIPT_ON /* committed_state */, RunTest(content::DEFER_ALL_SCRIPT_ON /* committed_state */,
content::PREVIEWS_UNSPECIFIED /* allowed_state */, content::PREVIEWS_UNSPECIFIED /* allowed_state */,
false /* origin_opt_out */, false /* save_data_enabled */, false /* origin_opt_out */, false /* save_data_enabled */,
{} /* eligibility_reasons */, {} /* eligibility_reasons */);
base::nullopt /* navigation_restart_penalty */);
tester()->metrics_web_contents_observer()->BroadcastEventToObservers( tester()->metrics_web_contents_observer()->BroadcastEventToObservers(
PreviewsUITabHelper::OptOutEventKey()); PreviewsUITabHelper::OptOutEventKey());
...@@ -498,138 +456,107 @@ TEST_F(PreviewsUKMObserverTest, DeferAllScriptOptOutChip) { ...@@ -498,138 +456,107 @@ TEST_F(PreviewsUKMObserverTest, DeferAllScriptOptOutChip) {
ValidatePreviewsUKM(content::DEFER_ALL_SCRIPT_ON, 2 /* opt_out_value */, ValidatePreviewsUKM(content::DEFER_ALL_SCRIPT_ON, 2 /* opt_out_value */,
false /* origin_opt_out_expected */, false /* origin_opt_out_expected */,
false /* save_data_enabled_expected */, false /* save_data_enabled_expected */,
true /* previews_likely */, {} /* eligibility_reasons */, true /* previews_likely */, {} /* eligibility_reasons */);
base::nullopt /* navigation_restart_penalty */);
} }
TEST_F(PreviewsUKMObserverTest, OriginOptOut) { TEST_F(PreviewsUKMObserverTest, OriginOptOut) {
RunTest(content::PREVIEWS_OFF /* committed_state */, RunTest(content::PREVIEWS_OFF /* committed_state */,
content::PREVIEWS_UNSPECIFIED /* allowed_state */, content::PREVIEWS_UNSPECIFIED /* allowed_state */,
true /* origin_opt_out */, false /* save_data_enabled */, true /* origin_opt_out */, false /* save_data_enabled */,
{} /* eligibility_reasons */, {} /* eligibility_reasons */);
base::nullopt /* navigation_restart_penalty */);
tester()->NavigateToUntrackedUrl(); tester()->NavigateToUntrackedUrl();
ValidatePreviewsUKM(content::PREVIEWS_UNSPECIFIED, 0 /* opt_out_value */, ValidatePreviewsUKM(content::PREVIEWS_UNSPECIFIED, 0 /* opt_out_value */,
true /* origin_opt_out_expected */, true /* origin_opt_out_expected */,
false /* save_data_enabled_expected */, false /* save_data_enabled_expected */,
false /* previews_likely */, {} /* eligibility_reasons */, false /* previews_likely */,
base::nullopt /* navigation_restart_penalty */); {} /* eligibility_reasons */);
} }
TEST_F(PreviewsUKMObserverTest, DataSaverEnabled) { TEST_F(PreviewsUKMObserverTest, DataSaverEnabled) {
RunTest(content::PREVIEWS_OFF /* committed_state */, RunTest(content::PREVIEWS_OFF /* committed_state */,
content::PREVIEWS_UNSPECIFIED /* allowed_state */, content::PREVIEWS_UNSPECIFIED /* allowed_state */,
false /* origin_opt_out */, true /* save_data_enabled */, false /* origin_opt_out */, true /* save_data_enabled */,
{} /* eligibility_reasons */, {} /* eligibility_reasons */);
base::nullopt /* navigation_restart_penalty */);
tester()->NavigateToUntrackedUrl(); tester()->NavigateToUntrackedUrl();
ValidatePreviewsUKM(content::PREVIEWS_UNSPECIFIED, 0 /* opt_out_value */, ValidatePreviewsUKM(content::PREVIEWS_UNSPECIFIED, 0 /* opt_out_value */,
false /* origin_opt_out_expected */, false /* origin_opt_out_expected */,
true /* save_data_enabled_expected */, true /* save_data_enabled_expected */,
false /* previews_likely */, {} /* eligibility_reasons */, false /* previews_likely */,
base::nullopt /* navigation_restart_penalty */); {} /* eligibility_reasons */);
}
// Navigation restart penalty can occur independently of a preview being
// committed so we do not consider the opt out tests here.
TEST_F(PreviewsUKMObserverTest, NavigationRestartPenaltySeen) {
RunTest(
content::PREVIEWS_OFF /* committed_state */,
content::PREVIEWS_UNSPECIFIED /* allowed_state */,
false /* origin_opt_out */, false /* save_data_enabled */,
{} /* eligibility_reasons */,
base::TimeDelta::FromMilliseconds(1337) /* navigation_restart_penalty */);
tester()->NavigateToUntrackedUrl();
ValidatePreviewsUKM(
content::PREVIEWS_UNSPECIFIED, 0 /* opt_out_value */,
false /* origin_opt_out_expected */,
false /* save_data_enabled_expected */, false /* previews_likely */,
{} /* eligibility_reasons */,
base::TimeDelta::FromMilliseconds(1337) /* navigation_restart_penalty */);
} }
TEST_F(PreviewsUKMObserverTest, PreviewsLikelySet_PreCommitDecision) { TEST_F(PreviewsUKMObserverTest, PreviewsLikelySet_PreCommitDecision) {
RunTest(content::OFFLINE_PAGE_ON /* committed_state */, RunTest(content::OFFLINE_PAGE_ON /* committed_state */,
content::OFFLINE_PAGE_ON | content::NOSCRIPT_ON /* allowed_state */, content::OFFLINE_PAGE_ON | content::NOSCRIPT_ON /* allowed_state */,
false /* origin_opt_out */, true /* save_data_enabled */, false /* origin_opt_out */, true /* save_data_enabled */,
{} /* eligibility_reasons */, {} /* eligibility_reasons */);
base::nullopt /* navigation_restart_penalty */);
tester()->NavigateToUntrackedUrl(); tester()->NavigateToUntrackedUrl();
ValidatePreviewsUKM(content::OFFLINE_PAGE_ON, 0 /* opt_out_value */, ValidatePreviewsUKM(content::OFFLINE_PAGE_ON, 0 /* opt_out_value */,
false /* origin_opt_out_expected */, false /* origin_opt_out_expected */,
true /* save_data_enabled_expected */, true /* save_data_enabled_expected */,
true /* previews_likely */, {} /* eligibility_reasons */, true /* previews_likely */, {} /* eligibility_reasons */);
base::nullopt /* navigation_restart_penalty */);
} }
TEST_F(PreviewsUKMObserverTest, PreviewsLikelyNotSet_PostCommitDecision) { TEST_F(PreviewsUKMObserverTest, PreviewsLikelyNotSet_PostCommitDecision) {
RunTest(content::PREVIEWS_OFF /* committed_state */, RunTest(content::PREVIEWS_OFF /* committed_state */,
content::NOSCRIPT_ON /* allowed_state */, false /* origin_opt_out */, content::NOSCRIPT_ON /* allowed_state */, false /* origin_opt_out */,
true /* save_data_enabled */, {} /* eligibility_reasons */, true /* save_data_enabled */, {} /* eligibility_reasons */);
base::nullopt /* navigation_restart_penalty */);
tester()->NavigateToUntrackedUrl(); tester()->NavigateToUntrackedUrl();
ValidatePreviewsUKM(content::PREVIEWS_UNSPECIFIED, 0 /* opt_out_value */, ValidatePreviewsUKM(content::PREVIEWS_UNSPECIFIED, 0 /* opt_out_value */,
false /* origin_opt_out_expected */, false /* origin_opt_out_expected */,
true /* save_data_enabled_expected */, true /* save_data_enabled_expected */,
false /* previews_likely */, {} /* eligibility_reasons */, false /* previews_likely */,
base::nullopt /* navigation_restart_penalty */); {} /* eligibility_reasons */);
} }
TEST_F(PreviewsUKMObserverTest, PreviewsLikelyNotSet_PreviewsOff) { TEST_F(PreviewsUKMObserverTest, PreviewsLikelyNotSet_PreviewsOff) {
RunTest(content::PREVIEWS_OFF /* committed_state */, RunTest(content::PREVIEWS_OFF /* committed_state */,
content::PREVIEWS_OFF /* allowed_state */, false /* origin_opt_out */, content::PREVIEWS_OFF /* allowed_state */, false /* origin_opt_out */,
true /* save_data_enabled */, {} /* eligibility_reasons */, true /* save_data_enabled */, {} /* eligibility_reasons */);
base::nullopt /* navigation_restart_penalty */);
tester()->NavigateToUntrackedUrl(); tester()->NavigateToUntrackedUrl();
ValidatePreviewsUKM(content::PREVIEWS_UNSPECIFIED, 0 /* opt_out_value */, ValidatePreviewsUKM(content::PREVIEWS_UNSPECIFIED, 0 /* opt_out_value */,
false /* origin_opt_out_expected */, false /* origin_opt_out_expected */,
true /* save_data_enabled_expected */, true /* save_data_enabled_expected */,
false /* previews_likely */, {} /* eligibility_reasons */, false /* previews_likely */,
base::nullopt /* navigation_restart_penalty */); {} /* eligibility_reasons */);
} }
TEST_F(PreviewsUKMObserverTest, CoinFlipResult_Holdback) { TEST_F(PreviewsUKMObserverTest, CoinFlipResult_Holdback) {
RunTest(content::OFFLINE_PAGE_ON /* committed_state */, RunTest(content::OFFLINE_PAGE_ON /* committed_state */,
content::OFFLINE_PAGE_ON /* allowed_state */, content::OFFLINE_PAGE_ON /* allowed_state */,
false /* origin_opt_out */, true /* save_data_enabled */, false /* origin_opt_out */, true /* save_data_enabled */,
{} /* eligibility_reasons */, {} /* eligibility_reasons */);
base::nullopt /* navigation_restart_penalty */);
tester()->NavigateToUntrackedUrl(); tester()->NavigateToUntrackedUrl();
ValidatePreviewsUKM(content::OFFLINE_PAGE_ON, 0 /* opt_out_value */, ValidatePreviewsUKM(content::OFFLINE_PAGE_ON, 0 /* opt_out_value */,
false /* origin_opt_out_expected */, false /* origin_opt_out_expected */,
true /* save_data_enabled_expected */, true /* save_data_enabled_expected */,
true /* previews_likely */, {} /* eligibility_reasons */, true /* previews_likely */, {} /* eligibility_reasons */);
base::nullopt /* navigation_restart_penalty */);
} }
TEST_F(PreviewsUKMObserverTest, CoinFlipResult_Allowed) { TEST_F(PreviewsUKMObserverTest, CoinFlipResult_Allowed) {
RunTest(content::OFFLINE_PAGE_ON /* committed_state */, RunTest(content::OFFLINE_PAGE_ON /* committed_state */,
content::OFFLINE_PAGE_ON /* allowed_state */, content::OFFLINE_PAGE_ON /* allowed_state */,
false /* origin_opt_out */, true /* save_data_enabled */, false /* origin_opt_out */, true /* save_data_enabled */,
{} /* eligibility_reasons */, {} /* eligibility_reasons */);
base::nullopt /* navigation_restart_penalty */);
tester()->NavigateToUntrackedUrl(); tester()->NavigateToUntrackedUrl();
ValidatePreviewsUKM(content::OFFLINE_PAGE_ON, 0 /* opt_out_value */, ValidatePreviewsUKM(content::OFFLINE_PAGE_ON, 0 /* opt_out_value */,
false /* origin_opt_out_expected */, false /* origin_opt_out_expected */,
true /* save_data_enabled_expected */, true /* save_data_enabled_expected */,
true /* previews_likely */, {} /* eligibility_reasons */, true /* previews_likely */, {} /* eligibility_reasons */);
base::nullopt /* navigation_restart_penalty */);
} }
TEST_F(PreviewsUKMObserverTest, LogPreviewsEligibilityReason_WithAllowed) { TEST_F(PreviewsUKMObserverTest, LogPreviewsEligibilityReason_WithAllowed) {
...@@ -645,8 +572,7 @@ TEST_F(PreviewsUKMObserverTest, LogPreviewsEligibilityReason_WithAllowed) { ...@@ -645,8 +572,7 @@ TEST_F(PreviewsUKMObserverTest, LogPreviewsEligibilityReason_WithAllowed) {
PreviewsEligibilityReason::BLACKLIST_DATA_NOT_LOADED}, PreviewsEligibilityReason::BLACKLIST_DATA_NOT_LOADED},
// ALLOWED is equal to zero and should not be recorded. // ALLOWED is equal to zero and should not be recorded.
{PreviewsType::LITE_PAGE_REDIRECT, {PreviewsType::LITE_PAGE_REDIRECT,
PreviewsEligibilityReason::ALLOWED}} /* eligibility_reasons */, PreviewsEligibilityReason::ALLOWED}} /* eligibility_reasons */);
base::nullopt /* navigation_restart_penalty */);
tester()->NavigateToUntrackedUrl(); tester()->NavigateToUntrackedUrl();
...@@ -660,8 +586,7 @@ TEST_F(PreviewsUKMObserverTest, LogPreviewsEligibilityReason_WithAllowed) { ...@@ -660,8 +586,7 @@ TEST_F(PreviewsUKMObserverTest, LogPreviewsEligibilityReason_WithAllowed) {
PreviewsEligibilityReason::BLACKLIST_UNAVAILABLE}, PreviewsEligibilityReason::BLACKLIST_UNAVAILABLE},
{PreviewsType::NOSCRIPT, {PreviewsType::NOSCRIPT,
PreviewsEligibilityReason:: PreviewsEligibilityReason::
BLACKLIST_DATA_NOT_LOADED}} /* eligibility_reasons */, BLACKLIST_DATA_NOT_LOADED}} /* eligibility_reasons */);
base::nullopt /* navigation_restart_penalty */);
} }
TEST_F(PreviewsUKMObserverTest, LogPreviewsEligibilityReason_NoneAllowed) { TEST_F(PreviewsUKMObserverTest, LogPreviewsEligibilityReason_NoneAllowed) {
...@@ -677,8 +602,7 @@ TEST_F(PreviewsUKMObserverTest, LogPreviewsEligibilityReason_NoneAllowed) { ...@@ -677,8 +602,7 @@ TEST_F(PreviewsUKMObserverTest, LogPreviewsEligibilityReason_NoneAllowed) {
PreviewsEligibilityReason::BLACKLIST_DATA_NOT_LOADED}, PreviewsEligibilityReason::BLACKLIST_DATA_NOT_LOADED},
{PreviewsType::LITE_PAGE_REDIRECT, {PreviewsType::LITE_PAGE_REDIRECT,
PreviewsEligibilityReason:: PreviewsEligibilityReason::
BLACKLIST_DATA_NOT_LOADED}} /* eligibility_reasons */, BLACKLIST_DATA_NOT_LOADED}} /* eligibility_reasons */);
base::nullopt /* navigation_restart_penalty */);
tester()->NavigateToUntrackedUrl(); tester()->NavigateToUntrackedUrl();
...@@ -694,40 +618,37 @@ TEST_F(PreviewsUKMObserverTest, LogPreviewsEligibilityReason_NoneAllowed) { ...@@ -694,40 +618,37 @@ TEST_F(PreviewsUKMObserverTest, LogPreviewsEligibilityReason_NoneAllowed) {
PreviewsEligibilityReason::BLACKLIST_DATA_NOT_LOADED}, PreviewsEligibilityReason::BLACKLIST_DATA_NOT_LOADED},
{PreviewsType::LITE_PAGE_REDIRECT, {PreviewsType::LITE_PAGE_REDIRECT,
PreviewsEligibilityReason:: PreviewsEligibilityReason::
BLACKLIST_DATA_NOT_LOADED}} /* eligibility_reasons */, BLACKLIST_DATA_NOT_LOADED}} /* eligibility_reasons */);
base::nullopt /* navigation_restart_penalty */);
} }
TEST_F(PreviewsUKMObserverTest, CheckReportingForHidden) { TEST_F(PreviewsUKMObserverTest, CheckReportingForHidden) {
RunTest(content::PREVIEWS_OFF /* committed_state */, RunTest(content::PREVIEWS_OFF /* committed_state */,
content::PREVIEWS_UNSPECIFIED /* allowed_state */, content::PREVIEWS_UNSPECIFIED /* allowed_state */,
false /* origin_opt_out */, true /* save_data_enabled */, false /* origin_opt_out */, true /* save_data_enabled */,
{} /* eligibility_reasons */, {} /* eligibility_reasons */);
base::nullopt /* navigation_restart_penalty */);
web_contents()->WasHidden(); web_contents()->WasHidden();
ValidatePreviewsUKM(content::PREVIEWS_UNSPECIFIED, 0 /* opt_out_value */, ValidatePreviewsUKM(content::PREVIEWS_UNSPECIFIED, 0 /* opt_out_value */,
false /* origin_opt_out_expected */, false /* origin_opt_out_expected */,
true /* save_data_enabled_expected */, true /* save_data_enabled_expected */,
false /* previews_likely */, {} /* eligibility_reasons */, false /* previews_likely */,
base::nullopt /* navigation_restart_penalty */); {} /* eligibility_reasons */);
} }
TEST_F(PreviewsUKMObserverTest, CheckReportingForFlushMetrics) { TEST_F(PreviewsUKMObserverTest, CheckReportingForFlushMetrics) {
RunTest(content::PREVIEWS_OFF /* committed_state */, RunTest(content::PREVIEWS_OFF /* committed_state */,
content::PREVIEWS_UNSPECIFIED /* allowed_state */, content::PREVIEWS_UNSPECIFIED /* allowed_state */,
false /* origin_opt_out */, true /* save_data_enabled */, false /* origin_opt_out */, true /* save_data_enabled */,
{} /* eligibility_reasons */, {} /* eligibility_reasons */);
base::nullopt /* navigation_restart_penalty */);
tester()->SimulateAppEnterBackground(); tester()->SimulateAppEnterBackground();
ValidatePreviewsUKM(content::PREVIEWS_UNSPECIFIED, 0 /* opt_out_value */, ValidatePreviewsUKM(content::PREVIEWS_UNSPECIFIED, 0 /* opt_out_value */,
false /* origin_opt_out_expected */, false /* origin_opt_out_expected */,
true /* save_data_enabled_expected */, true /* save_data_enabled_expected */,
false /* previews_likely */, {} /* eligibility_reasons */, false /* previews_likely */,
base::nullopt /* navigation_restart_penalty */); {} /* eligibility_reasons */);
} }
TEST_F(PreviewsUKMObserverTest, TestPageEndReasonUMA) { TEST_F(PreviewsUKMObserverTest, TestPageEndReasonUMA) {
...@@ -737,8 +658,7 @@ TEST_F(PreviewsUKMObserverTest, TestPageEndReasonUMA) { ...@@ -737,8 +658,7 @@ TEST_F(PreviewsUKMObserverTest, TestPageEndReasonUMA) {
RunTest(content::PREVIEWS_OFF /* committed_state */, RunTest(content::PREVIEWS_OFF /* committed_state */,
content::PREVIEWS_UNSPECIFIED /* allowed_state */, content::PREVIEWS_UNSPECIFIED /* allowed_state */,
false /* origin_opt_out */, false /* save_data_enabled */, false /* origin_opt_out */, false /* save_data_enabled */,
{} /* eligibility_reasons */, {} /* eligibility_reasons */);
base::nullopt /* navigation_restart_penalty */);
tester()->NavigateToUntrackedUrl(); tester()->NavigateToUntrackedUrl();
histogram_tester.ExpectUniqueSample( histogram_tester.ExpectUniqueSample(
"Previews.PageEndReason.None", "Previews.PageEndReason.None",
...@@ -750,8 +670,7 @@ TEST_F(PreviewsUKMObserverTest, TestPageEndReasonUMA) { ...@@ -750,8 +670,7 @@ TEST_F(PreviewsUKMObserverTest, TestPageEndReasonUMA) {
RunTest(content::LITE_PAGE_REDIRECT_ON /* committed_state */, RunTest(content::LITE_PAGE_REDIRECT_ON /* committed_state */,
content::PREVIEWS_UNSPECIFIED /* allowed_state */, content::PREVIEWS_UNSPECIFIED /* allowed_state */,
false /* origin_opt_out */, false /* save_data_enabled */, false /* origin_opt_out */, false /* save_data_enabled */,
{} /* eligibility_reasons */, {} /* eligibility_reasons */);
base::nullopt /* navigation_restart_penalty */);
tester()->NavigateToUntrackedUrl(); tester()->NavigateToUntrackedUrl();
histogram_tester.ExpectUniqueSample( histogram_tester.ExpectUniqueSample(
"Previews.PageEndReason.LitePageRedirect", "Previews.PageEndReason.LitePageRedirect",
...@@ -764,8 +683,7 @@ TEST_F(PreviewsUKMObserverTest, TestPageEndReasonUMA) { ...@@ -764,8 +683,7 @@ TEST_F(PreviewsUKMObserverTest, TestPageEndReasonUMA) {
RunTest(content::DEFER_ALL_SCRIPT_ON /* committed_state */, RunTest(content::DEFER_ALL_SCRIPT_ON /* committed_state */,
content::PREVIEWS_UNSPECIFIED /* allowed_state */, content::PREVIEWS_UNSPECIFIED /* allowed_state */,
false /* origin_opt_out */, false /* save_data_enabled */, false /* origin_opt_out */, false /* save_data_enabled */,
{} /* eligibility_reasons */, {} /* eligibility_reasons */);
base::nullopt /* navigation_restart_penalty */);
tester()->NavigateToUntrackedUrl(); tester()->NavigateToUntrackedUrl();
histogram_tester.ExpectUniqueSample( histogram_tester.ExpectUniqueSample(
"Previews.PageEndReason.DeferAllScript", "Previews.PageEndReason.DeferAllScript",
......
chrome/browser/previews/previews_content_util.cc
View file @ de7284e4
...@@ -201,9 +201,6 @@ CreateServerLitePageInfoFromNavigationHandle( ...@@ -201,9 +201,6 @@ CreateServerLitePageInfoFromNavigationHandle(
if (!navigation_handle->GetWebContents()) if (!navigation_handle->GetWebContents())
return nullptr; return nullptr;
server_lite_page_info->original_navigation_start =
navigation_handle->NavigationStart();
const net::HttpRequestHeaders& headers = const net::HttpRequestHeaders& headers =
navigation_handle->GetRequestHeaders(); navigation_handle->GetRequestHeaders();
......
chrome/browser/previews/previews_lite_page_redirect_url_loader_interceptor.cc
View file @ de7284e4
...@@ -237,7 +237,6 @@ PreviewsLitePageRedirectURLLoaderInterceptor::GetOrCreateServerLitePageInfo( ...@@ -237,7 +237,6 @@ PreviewsLitePageRedirectURLLoaderInterceptor::GetOrCreateServerLitePageInfo(
previews::PreviewsUserData::ServerLitePageInfo* info = previews::PreviewsUserData::ServerLitePageInfo* info =
previews_data->server_lite_page_info(); previews_data->server_lite_page_info();
info->original_navigation_start = navigation_handle->NavigationStart();
if (session_id.has_value()) if (session_id.has_value())
info->drp_session_key = session_id.value(); info->drp_session_key = session_id.value();
......
components/previews/content/previews_user_data.h
View file @ de7284e4
...@@ -31,10 +31,6 @@ class PreviewsUserData { ...@@ -31,10 +31,6 @@ class PreviewsUserData {
return std::make_unique<ServerLitePageInfo>(*this); return std::make_unique<ServerLitePageInfo>(*this);
} }
// The start time of the original navigation, that is, the one started by
// the user.
base::TimeTicks original_navigation_start = base::TimeTicks();
// The page id used for this preview. // The page id used for this preview.
uint64_t page_id = 0; uint64_t page_id = 0;
......
components/previews/content/previews_user_data_unittest.cc
View file @ de7284e4
...@@ -47,8 +47,6 @@ TEST(PreviewsUserDataTest, DeepCopy) { ...@@ -47,8 +47,6 @@ TEST(PreviewsUserDataTest, DeepCopy) {
EXPECT_FALSE(data->offline_preview_used()); EXPECT_FALSE(data->offline_preview_used());
EXPECT_EQ(data->server_lite_page_info(), nullptr); EXPECT_EQ(data->server_lite_page_info(), nullptr);
base::TimeTicks now = base::TimeTicks::Now();
data->set_data_savings_inflation_percent(123); data->set_data_savings_inflation_percent(123);
data->set_cache_control_no_transform_directive(); data->set_cache_control_no_transform_directive();
data->SetCommittedPreviewsType(previews::PreviewsType::NOSCRIPT); data->SetCommittedPreviewsType(previews::PreviewsType::NOSCRIPT);
...@@ -56,7 +54,6 @@ TEST(PreviewsUserDataTest, DeepCopy) { ...@@ -56,7 +54,6 @@ TEST(PreviewsUserDataTest, DeepCopy) {
data->set_black_listed_for_lite_page(true); data->set_black_listed_for_lite_page(true);
data->set_server_lite_page_info( data->set_server_lite_page_info(
std::make_unique<PreviewsUserData::ServerLitePageInfo>()); std::make_unique<PreviewsUserData::ServerLitePageInfo>());
data->server_lite_page_info()->original_navigation_start = now;
PreviewsUserData data_copy(*data); PreviewsUserData data_copy(*data);
EXPECT_EQ(id, data_copy.page_id()); EXPECT_EQ(id, data_copy.page_id());
...@@ -68,7 +65,6 @@ TEST(PreviewsUserDataTest, DeepCopy) { ...@@ -68,7 +65,6 @@ TEST(PreviewsUserDataTest, DeepCopy) {
EXPECT_TRUE(data_copy.black_listed_for_lite_page()); EXPECT_TRUE(data_copy.black_listed_for_lite_page());
EXPECT_TRUE(data_copy.offline_preview_used()); EXPECT_TRUE(data_copy.offline_preview_used());
EXPECT_NE(data->server_lite_page_info(), nullptr); EXPECT_NE(data->server_lite_page_info(), nullptr);
EXPECT_EQ(data->server_lite_page_info()->original_navigation_start, now);
} }
TEST(PreviewsUserDataTest, TestCoinFlip_HasCommittedPreviewsType) { TEST(PreviewsUserDataTest, TestCoinFlip_HasCommittedPreviewsType) {
......
tools/metrics/ukm/ukm.xml
View file @ de7284e4
...@@ -7670,6 +7670,9 @@ be describing additional metrics about the same event. ...@@ -7670,6 +7670,9 @@ be describing additional metrics about the same event.
</summary> </summary>
</metric> </metric>
<metric name="navigation_restart_penalty"> <metric name="navigation_restart_penalty">
<obsolete>
Feature removed in M79.
</obsolete>
<summary> <summary>
Set to the number of milliseconds spent restarting navigations when a Lite Set to the number of milliseconds spent restarting navigations when a Lite
Page Redirect preview is attempted, whether or not it is committed, during Page Redirect preview is attempted, whether or not it is committed, during
......
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