Skip to content

GitLab

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

Log Preview Eligibility Reasons in UKM 

Only non-ALLOWED values are logged.

Bug: 955472
Change-Id: I7480df4ce7597319fc6cbd18bc23da8e7c46625f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1597688Reviewed-by: default avatarRyan Sturm <ryansturm@chromium.org>
Reviewed-by: default avatarRobert Kaplow <rkaplow@chromium.org>
Reviewed-by: default avatarDoug Arnett <dougarnett@chromium.org>
Commit-Queue: Robert Ogden <robertogden@chromium.org>
Cr-Commit-Position: refs/heads/master@{#658548}
parent 8ae6ca2b
Show whitespace changes
Inline Side-by-side
Showing with 326 additions and 72 deletions
chrome/browser/page_load_metrics/observers/previews_ukm_observer.cc
View file @ 3558bd74
...@@ -37,6 +37,16 @@ namespace { ...@@ -37,6 +37,16 @@ namespace {
const char kOfflinePreviewsMimeType[] = "multipart/related"; const char kOfflinePreviewsMimeType[] = "multipart/related";
bool ShouldOptionalEligibilityReasonBeRecorded(
base::Optional<previews::PreviewsEligibilityReason> reason) {
if (!reason.has_value())
return false;
// Do not record ALLOWED values since we are only interested in recording
// reasons why a preview was not eligible to be shown.
return reason.value() != previews::PreviewsEligibilityReason::ALLOWED;
}
} // namespace } // namespace
PreviewsUKMObserver::PreviewsUKMObserver() PreviewsUKMObserver::PreviewsUKMObserver()
...@@ -106,16 +116,30 @@ PreviewsUKMObserver::OnCommit(content::NavigationHandle* navigation_handle, ...@@ -106,16 +116,30 @@ PreviewsUKMObserver::OnCommit(content::NavigationHandle* navigation_handle,
previews::PreviewsType::RESOURCE_LOADING_HINTS) { previews::PreviewsType::RESOURCE_LOADING_HINTS) {
resource_loading_hints_seen_ = true; resource_loading_hints_seen_ = true;
} }
if (previews_user_data && if (previews_user_data->cache_control_no_transform_directive()) {
previews_user_data->cache_control_no_transform_directive()) {
origin_opt_out_occurred_ = true; origin_opt_out_occurred_ = true;
} }
if (previews_user_data && previews_user_data->server_lite_page_info()) { if (previews_user_data->server_lite_page_info()) {
navigation_restart_penalty_ = navigation_restart_penalty_ =
navigation_handle->NavigationStart() - navigation_handle->NavigationStart() -
previews_user_data->server_lite_page_info()->original_navigation_start; previews_user_data->server_lite_page_info()->original_navigation_start;
} }
lite_page_eligibility_reason_ =
previews_user_data->EligibilityReasonForPreview(
previews::PreviewsType::LITE_PAGE);
lite_page_redirect_eligibility_reason_ =
previews_user_data->EligibilityReasonForPreview(
previews::PreviewsType::LITE_PAGE_REDIRECT);
noscript_eligibility_reason_ =
previews_user_data->EligibilityReasonForPreview(
previews::PreviewsType::NOSCRIPT);
resource_loading_hints_eligibility_reason_ =
previews_user_data->EligibilityReasonForPreview(
previews::PreviewsType::RESOURCE_LOADING_HINTS);
offline_eligibility_reason_ = previews_user_data->EligibilityReasonForPreview(
previews::PreviewsType::OFFLINE);
return CONTINUE_OBSERVING; return CONTINUE_OBSERVING;
} }
...@@ -219,6 +243,30 @@ void PreviewsUKMObserver::RecordPreviewsTypes( ...@@ -219,6 +243,30 @@ void PreviewsUKMObserver::RecordPreviewsTypes(
builder.Setnavigation_restart_penalty( builder.Setnavigation_restart_penalty(
navigation_restart_penalty_->InMilliseconds()); navigation_restart_penalty_->InMilliseconds());
} }
if (ShouldOptionalEligibilityReasonBeRecorded(
lite_page_eligibility_reason_)) {
builder.Setproxy_lite_page_eligibility_reason(
static_cast<int>(lite_page_eligibility_reason_.value()));
}
if (ShouldOptionalEligibilityReasonBeRecorded(
lite_page_redirect_eligibility_reason_)) {
builder.Setlite_page_redirect_eligibility_reason(
static_cast<int>(lite_page_redirect_eligibility_reason_.value()));
}
if (ShouldOptionalEligibilityReasonBeRecorded(noscript_eligibility_reason_)) {
builder.Setnoscript_eligibility_reason(
static_cast<int>(noscript_eligibility_reason_.value()));
}
if (ShouldOptionalEligibilityReasonBeRecorded(
resource_loading_hints_eligibility_reason_)) {
builder.Setresource_loading_hints_eligibility_reason(
static_cast<int>(resource_loading_hints_eligibility_reason_.value()));
}
if (ShouldOptionalEligibilityReasonBeRecorded(offline_eligibility_reason_)) {
builder.Setoffline_eligibility_reason(
static_cast<int>(offline_eligibility_reason_.value()));
}
builder.Record(ukm::UkmRecorder::Get()); builder.Record(ukm::UkmRecorder::Get());
} }
......
chrome/browser/page_load_metrics/observers/previews_ukm_observer.h
View file @ 3558bd74
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
#include "base/sequence_checker.h" #include "base/sequence_checker.h"
#include "base/time/time.h" #include "base/time/time.h"
#include "chrome/browser/page_load_metrics/page_load_metrics_observer.h" #include "chrome/browser/page_load_metrics/page_load_metrics_observer.h"
#include "components/previews/core/previews_black_list.h"
#include "components/previews/core/previews_experiments.h" #include "components/previews/core/previews_experiments.h"
namespace content { namespace content {
...@@ -73,6 +74,16 @@ class PreviewsUKMObserver : public page_load_metrics::PageLoadMetricsObserver { ...@@ -73,6 +74,16 @@ class PreviewsUKMObserver : public page_load_metrics::PageLoadMetricsObserver {
bool origin_opt_out_occurred_ = false; bool origin_opt_out_occurred_ = false;
bool save_data_enabled_ = false; bool save_data_enabled_ = false;
bool previews_likely_ = false; bool previews_likely_ = false;
base::Optional<previews::PreviewsEligibilityReason>
lite_page_eligibility_reason_ = base::nullopt;
base::Optional<previews::PreviewsEligibilityReason>
lite_page_redirect_eligibility_reason_ = base::nullopt;
base::Optional<previews::PreviewsEligibilityReason>
noscript_eligibility_reason_ = base::nullopt;
base::Optional<previews::PreviewsEligibilityReason>
resource_loading_hints_eligibility_reason_ = base::nullopt;
base::Optional<previews::PreviewsEligibilityReason>
offline_eligibility_reason_ = base::nullopt;
CoinFlipHoldbackResult coin_flip_result_ = CoinFlipHoldbackResult::kNotSet; CoinFlipHoldbackResult coin_flip_result_ = CoinFlipHoldbackResult::kNotSet;
base::Optional<base::TimeDelta> navigation_restart_penalty_ = base::nullopt; base::Optional<base::TimeDelta> navigation_restart_penalty_ = base::nullopt;
......
chrome/browser/page_load_metrics/observers/previews_ukm_observer_unittest.cc
View file @ 3558bd74
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
#include "chrome/browser/page_load_metrics/observers/previews_ukm_observer.h" #include "chrome/browser/page_load_metrics/observers/previews_ukm_observer.h"
#include <memory> #include <memory>
#include <unordered_map>
#include "base/macros.h" #include "base/macros.h"
#include "base/metrics/metrics_hashes.h" #include "base/metrics/metrics_hashes.h"
...@@ -49,6 +50,8 @@ class TestPreviewsUKMObserver : public PreviewsUKMObserver { ...@@ -49,6 +50,8 @@ class TestPreviewsUKMObserver : public PreviewsUKMObserver {
bool save_data_enabled, bool save_data_enabled,
bool is_offline_preview, bool is_offline_preview,
CoinFlipHoldbackResult coin_flip_result, CoinFlipHoldbackResult coin_flip_result,
std::unordered_map<PreviewsType, PreviewsEligibilityReason>
eligibility_reasons,
base::Optional<base::TimeDelta> navigation_restart_penalty) base::Optional<base::TimeDelta> navigation_restart_penalty)
: committed_preview_(committed_preview), : committed_preview_(committed_preview),
allowed_state_(allowed_state), allowed_state_(allowed_state),
...@@ -60,6 +63,7 @@ class TestPreviewsUKMObserver : public PreviewsUKMObserver { ...@@ -60,6 +63,7 @@ class TestPreviewsUKMObserver : public PreviewsUKMObserver {
save_data_enabled_(save_data_enabled), save_data_enabled_(save_data_enabled),
is_offline_preview_(is_offline_preview), is_offline_preview_(is_offline_preview),
coin_flip_result_(coin_flip_result), coin_flip_result_(coin_flip_result),
eligibility_reasons_(eligibility_reasons),
navigation_restart_penalty_(navigation_restart_penalty) {} navigation_restart_penalty_(navigation_restart_penalty) {}
~TestPreviewsUKMObserver() override {} ~TestPreviewsUKMObserver() override {}
...@@ -124,6 +128,11 @@ class TestPreviewsUKMObserver : public PreviewsUKMObserver { ...@@ -124,6 +128,11 @@ class TestPreviewsUKMObserver : public PreviewsUKMObserver {
user_data->set_cache_control_no_transform_directive(); user_data->set_cache_control_no_transform_directive();
} }
for (auto iter = eligibility_reasons_.begin();
iter != eligibility_reasons_.end(); iter++) {
user_data->SetEligibilityReasonForPreview(iter->first, iter->second);
}
return PreviewsUKMObserver::OnCommit(navigation_handle, source_id); return PreviewsUKMObserver::OnCommit(navigation_handle, source_id);
} }
...@@ -147,6 +156,8 @@ class TestPreviewsUKMObserver : public PreviewsUKMObserver { ...@@ -147,6 +156,8 @@ class TestPreviewsUKMObserver : public PreviewsUKMObserver {
const bool save_data_enabled_; const bool save_data_enabled_;
const bool is_offline_preview_; const bool is_offline_preview_;
CoinFlipHoldbackResult coin_flip_result_; CoinFlipHoldbackResult coin_flip_result_;
std::unordered_map<PreviewsType, PreviewsEligibilityReason>
eligibility_reasons_;
base::Optional<base::TimeDelta> navigation_restart_penalty_; base::Optional<base::TimeDelta> navigation_restart_penalty_;
DISALLOW_COPY_AND_ASSIGN(TestPreviewsUKMObserver); DISALLOW_COPY_AND_ASSIGN(TestPreviewsUKMObserver);
...@@ -168,6 +179,8 @@ class PreviewsUKMObserverTest ...@@ -168,6 +179,8 @@ class PreviewsUKMObserverTest
bool save_data_enabled, bool save_data_enabled,
bool is_offline_preview, bool is_offline_preview,
CoinFlipHoldbackResult coin_flip_result, CoinFlipHoldbackResult coin_flip_result,
std::unordered_map<PreviewsType, PreviewsEligibilityReason>
eligibility_reasons,
base::Optional<base::TimeDelta> navigation_restart_penalty) { base::Optional<base::TimeDelta> navigation_restart_penalty) {
committed_preview_ = committed_preview; committed_preview_ = committed_preview;
allowed_state_ = allowed_state; allowed_state_ = allowed_state;
...@@ -179,6 +192,7 @@ class PreviewsUKMObserverTest ...@@ -179,6 +192,7 @@ class PreviewsUKMObserverTest
save_data_enabled_ = save_data_enabled; save_data_enabled_ = save_data_enabled;
is_offline_preview_ = is_offline_preview; is_offline_preview_ = is_offline_preview;
coin_flip_result_ = coin_flip_result; coin_flip_result_ = coin_flip_result;
eligibility_reasons_ = eligibility_reasons;
navigation_restart_penalty_ = navigation_restart_penalty; navigation_restart_penalty_ = navigation_restart_penalty;
auto navigation = content::NavigationSimulator::CreateBrowserInitiated( auto navigation = content::NavigationSimulator::CreateBrowserInitiated(
GURL(kDefaultTestUrl), web_contents()); GURL(kDefaultTestUrl), web_contents());
...@@ -200,6 +214,8 @@ class PreviewsUKMObserverTest ...@@ -200,6 +214,8 @@ class PreviewsUKMObserverTest
bool offline_preview_expected, bool offline_preview_expected,
bool previews_likely_expected, bool previews_likely_expected,
CoinFlipHoldbackResult coin_flip_result_expected, CoinFlipHoldbackResult coin_flip_result_expected,
std::unordered_map<PreviewsType, PreviewsEligibilityReason>
eligibility_reasons,
base::Optional<base::TimeDelta> navigation_restart_penalty) { base::Optional<base::TimeDelta> navigation_restart_penalty) {
using UkmEntry = ukm::builders::Previews; using UkmEntry = ukm::builders::Previews;
auto entries = test_ukm_recorder().GetEntriesByName(UkmEntry::kEntryName); auto entries = test_ukm_recorder().GetEntriesByName(UkmEntry::kEntryName);
...@@ -256,6 +272,61 @@ class PreviewsUKMObserverTest ...@@ -256,6 +272,61 @@ class PreviewsUKMObserverTest
entry, UkmEntry::knavigation_restart_penaltyName, entry, UkmEntry::knavigation_restart_penaltyName,
navigation_restart_penalty.value().InMilliseconds()); navigation_restart_penalty.value().InMilliseconds());
} }
int want_lite_page_eligibility_reason =
static_cast<int>(eligibility_reasons[PreviewsType::LITE_PAGE]);
if (want_lite_page_eligibility_reason) {
test_ukm_recorder().ExpectEntryMetric(
entry, UkmEntry::kproxy_lite_page_eligibility_reasonName,
want_lite_page_eligibility_reason);
} else {
EXPECT_FALSE(test_ukm_recorder().EntryHasMetric(
entry, UkmEntry::kproxy_lite_page_eligibility_reasonName));
}
int want_lite_page_redirect_eligibility_reason = static_cast<int>(
eligibility_reasons[PreviewsType::LITE_PAGE_REDIRECT]);
if (want_lite_page_redirect_eligibility_reason) {
test_ukm_recorder().ExpectEntryMetric(
entry, UkmEntry::klite_page_redirect_eligibility_reasonName,
want_lite_page_redirect_eligibility_reason);
} else {
EXPECT_FALSE(test_ukm_recorder().EntryHasMetric(
entry, UkmEntry::klite_page_redirect_eligibility_reasonName));
}
int want_noscript_eligibility_reason =
static_cast<int>(eligibility_reasons[PreviewsType::NOSCRIPT]);
if (want_noscript_eligibility_reason) {
test_ukm_recorder().ExpectEntryMetric(
entry, UkmEntry::knoscript_eligibility_reasonName,
want_noscript_eligibility_reason);
} else {
EXPECT_FALSE(test_ukm_recorder().EntryHasMetric(
entry, UkmEntry::knoscript_eligibility_reasonName));
}
int want_resource_loading_hints_eligibility_reason = static_cast<int>(
eligibility_reasons[PreviewsType::RESOURCE_LOADING_HINTS]);
if (want_resource_loading_hints_eligibility_reason) {
test_ukm_recorder().ExpectEntryMetric(
entry, UkmEntry::kresource_loading_hints_eligibility_reasonName,
want_resource_loading_hints_eligibility_reason);
} else {
EXPECT_FALSE(test_ukm_recorder().EntryHasMetric(
entry, UkmEntry::kresource_loading_hints_eligibility_reasonName));
}
int want_offline_eligibility_reason =
static_cast<int>(eligibility_reasons[PreviewsType::OFFLINE]);
if (want_offline_eligibility_reason) {
test_ukm_recorder().ExpectEntryMetric(
entry, UkmEntry::koffline_eligibility_reasonName,
want_offline_eligibility_reason);
} else {
EXPECT_FALSE(test_ukm_recorder().EntryHasMetric(
entry, UkmEntry::koffline_eligibility_reasonName));
}
} }
} }
...@@ -270,7 +341,7 @@ class PreviewsUKMObserverTest ...@@ -270,7 +341,7 @@ class PreviewsUKMObserverTest
committed_preview_, allowed_state_, lite_page_received_, committed_preview_, allowed_state_, lite_page_received_,
lite_page_redirect_received_, noscript_on_, resource_loading_hints_on_, lite_page_redirect_received_, noscript_on_, resource_loading_hints_on_,
origin_opt_out_, save_data_enabled_, is_offline_preview_, origin_opt_out_, save_data_enabled_, is_offline_preview_,
coin_flip_result_, navigation_restart_penalty_)); coin_flip_result_, eligibility_reasons_, navigation_restart_penalty_));
// Data is only added to the first navigation after RunTest(). // Data is only added to the first navigation after RunTest().
committed_preview_ = PreviewsType::NONE; committed_preview_ = PreviewsType::NONE;
allowed_state_ = content::PREVIEWS_OFF; allowed_state_ = content::PREVIEWS_OFF;
...@@ -280,6 +351,7 @@ class PreviewsUKMObserverTest ...@@ -280,6 +351,7 @@ class PreviewsUKMObserverTest
resource_loading_hints_on_ = false; resource_loading_hints_on_ = false;
origin_opt_out_ = false; origin_opt_out_ = false;
coin_flip_result_ = CoinFlipHoldbackResult::kNotSet; coin_flip_result_ = CoinFlipHoldbackResult::kNotSet;
eligibility_reasons_.clear();
navigation_restart_penalty_ = base::nullopt; navigation_restart_penalty_ = base::nullopt;
} }
...@@ -293,6 +365,8 @@ class PreviewsUKMObserverTest ...@@ -293,6 +365,8 @@ class PreviewsUKMObserverTest
bool origin_opt_out_ = false; bool origin_opt_out_ = false;
bool save_data_enabled_ = false; bool save_data_enabled_ = false;
bool is_offline_preview_ = false; bool is_offline_preview_ = false;
std::unordered_map<PreviewsType, PreviewsEligibilityReason>
eligibility_reasons_ = {};
CoinFlipHoldbackResult coin_flip_result_ = CoinFlipHoldbackResult::kNotSet; CoinFlipHoldbackResult coin_flip_result_ = CoinFlipHoldbackResult::kNotSet;
base::Optional<base::TimeDelta> navigation_restart_penalty_ = base::nullopt; base::Optional<base::TimeDelta> navigation_restart_penalty_ = base::nullopt;
...@@ -305,7 +379,7 @@ TEST_F(PreviewsUKMObserverTest, NoPreviewSeen) { ...@@ -305,7 +379,7 @@ TEST_F(PreviewsUKMObserverTest, NoPreviewSeen) {
false /* lite_page_redirect_received */, false /* noscript_on */, false /* lite_page_redirect_received */, false /* noscript_on */,
false /* resource_loading_hints_on */, false /* origin_opt_out */, false /* resource_loading_hints_on */, false /* origin_opt_out */,
false /* save_data_enabled */, false /* is_offline_preview */, false /* save_data_enabled */, false /* is_offline_preview */,
CoinFlipHoldbackResult::kNotSet, CoinFlipHoldbackResult::kNotSet, {} /* eligibility_reasons */,
base::nullopt /* navigation_restart_penalty */); base::nullopt /* navigation_restart_penalty */);
NavigateToUntrackedUrl(); NavigateToUntrackedUrl();
...@@ -317,7 +391,7 @@ TEST_F(PreviewsUKMObserverTest, NoPreviewSeen) { ...@@ -317,7 +391,7 @@ TEST_F(PreviewsUKMObserverTest, NoPreviewSeen) {
0 /* opt_out_value */, false /* origin_opt_out_expected */, 0 /* opt_out_value */, false /* origin_opt_out_expected */,
false /* save_data_enabled_expected */, false /* save_data_enabled_expected */,
false /* offline_preview_expected */, false /* previews_likely */, false /* offline_preview_expected */, false /* previews_likely */,
CoinFlipHoldbackResult::kNotSet, CoinFlipHoldbackResult::kNotSet, {} /* eligibility_reasons */,
base::nullopt /* navigation_restart_penalty */); base::nullopt /* navigation_restart_penalty */);
} }
...@@ -327,7 +401,7 @@ TEST_F(PreviewsUKMObserverTest, UntrackedPreviewTypeOptOut) { ...@@ -327,7 +401,7 @@ TEST_F(PreviewsUKMObserverTest, UntrackedPreviewTypeOptOut) {
false /* lite_page_redirect_received */, false /* noscript_on */, false /* lite_page_redirect_received */, false /* noscript_on */,
false /* resource_loading_hints_on */, false /* origin_opt_out */, false /* resource_loading_hints_on */, false /* origin_opt_out */,
false /* save_data_enabled */, false /* is_offline_preview */, false /* save_data_enabled */, false /* is_offline_preview */,
CoinFlipHoldbackResult::kNotSet, CoinFlipHoldbackResult::kNotSet, {} /* eligibility_reasons */,
base::nullopt /* navigation_restart_penalty */); base::nullopt /* navigation_restart_penalty */);
observer()->BroadcastEventToObservers(PreviewsUITabHelper::OptOutEventKey()); observer()->BroadcastEventToObservers(PreviewsUITabHelper::OptOutEventKey());
NavigateToUntrackedUrl(); NavigateToUntrackedUrl();
...@@ -341,7 +415,7 @@ TEST_F(PreviewsUKMObserverTest, UntrackedPreviewTypeOptOut) { ...@@ -341,7 +415,7 @@ TEST_F(PreviewsUKMObserverTest, UntrackedPreviewTypeOptOut) {
0 /* opt_out_value */, false /* origin_opt_out_expected */, 0 /* opt_out_value */, false /* origin_opt_out_expected */,
false /* save_data_enabled_expected */, false /* save_data_enabled_expected */,
false /* offline_preview_expected */, false /* previews_likely */, false /* offline_preview_expected */, false /* previews_likely */,
CoinFlipHoldbackResult::kNotSet, CoinFlipHoldbackResult::kNotSet, {} /* eligibility_reasons */,
base::nullopt /* navigation_restart_penalty */); base::nullopt /* navigation_restart_penalty */);
} }
...@@ -351,7 +425,7 @@ TEST_F(PreviewsUKMObserverTest, LitePageSeen) { ...@@ -351,7 +425,7 @@ TEST_F(PreviewsUKMObserverTest, LitePageSeen) {
false /* lite_page_redirect_received */, false /* noscript_on */, false /* lite_page_redirect_received */, false /* noscript_on */,
false /* resource_loading_hints_on */, false /* origin_opt_out */, false /* resource_loading_hints_on */, false /* origin_opt_out */,
false /* save_data_enabled */, false /* is_offline_preview */, false /* save_data_enabled */, false /* is_offline_preview */,
CoinFlipHoldbackResult::kNotSet, CoinFlipHoldbackResult::kNotSet, {} /* eligibility_reasons */,
base::nullopt /* navigation_restart_penalty */); base::nullopt /* navigation_restart_penalty */);
NavigateToUntrackedUrl(); NavigateToUntrackedUrl();
...@@ -364,7 +438,7 @@ TEST_F(PreviewsUKMObserverTest, LitePageSeen) { ...@@ -364,7 +438,7 @@ TEST_F(PreviewsUKMObserverTest, LitePageSeen) {
0 /* opt_out_value */, false /* origin_opt_out_expected */, 0 /* opt_out_value */, false /* origin_opt_out_expected */,
false /* save_data_enabled_expected */, false /* save_data_enabled_expected */,
false /* offline_preview_expected */, false /* previews_likely */, false /* offline_preview_expected */, false /* previews_likely */,
CoinFlipHoldbackResult::kNotSet, CoinFlipHoldbackResult::kNotSet, {} /* eligibility_reasons */,
base::nullopt /* navigation_restart_penalty */); base::nullopt /* navigation_restart_penalty */);
} }
...@@ -380,7 +454,7 @@ TEST_F(PreviewsUKMObserverTest, LitePageOptOut) { ...@@ -380,7 +454,7 @@ TEST_F(PreviewsUKMObserverTest, LitePageOptOut) {
false /* lite_page_redirect_received */, false /* noscript_on */, false /* lite_page_redirect_received */, false /* noscript_on */,
false /* resource_loading_hints_on */, false /* origin_opt_out */, false /* resource_loading_hints_on */, false /* origin_opt_out */,
false /* save_data_enabled */, false /* is_offline_preview */, false /* save_data_enabled */, false /* is_offline_preview */,
CoinFlipHoldbackResult::kNotSet, CoinFlipHoldbackResult::kNotSet, {} /* eligibility_reasons */,
base::nullopt /* navigation_restart_penalty */); base::nullopt /* navigation_restart_penalty */);
observer()->BroadcastEventToObservers(PreviewsUITabHelper::OptOutEventKey()); observer()->BroadcastEventToObservers(PreviewsUITabHelper::OptOutEventKey());
...@@ -394,7 +468,7 @@ TEST_F(PreviewsUKMObserverTest, LitePageOptOut) { ...@@ -394,7 +468,7 @@ TEST_F(PreviewsUKMObserverTest, LitePageOptOut) {
1 /* opt_out_value */, false /* origin_opt_out_expected */, 1 /* opt_out_value */, false /* origin_opt_out_expected */,
false /* save_data_enabled_expected */, false /* save_data_enabled_expected */,
false /* offline_preview_expected */, false /* previews_likely */, false /* offline_preview_expected */, false /* previews_likely */,
CoinFlipHoldbackResult::kNotSet, CoinFlipHoldbackResult::kNotSet, {} /* eligibility_reasons */,
base::nullopt /* navigation_restart_penalty */); base::nullopt /* navigation_restart_penalty */);
} }
...@@ -409,7 +483,7 @@ TEST_F(PreviewsUKMObserverTest, LitePageOptOutChip) { ...@@ -409,7 +483,7 @@ TEST_F(PreviewsUKMObserverTest, LitePageOptOutChip) {
false /* lite_page_redirect_received */, false /* noscript_on */, false /* lite_page_redirect_received */, false /* noscript_on */,
false /* resource_loading_hints_on */, false /* origin_opt_out */, false /* resource_loading_hints_on */, false /* origin_opt_out */,
false /* save_data_enabled */, false /* is_offline_preview */, false /* save_data_enabled */, false /* is_offline_preview */,
CoinFlipHoldbackResult::kNotSet, CoinFlipHoldbackResult::kNotSet, {} /* eligibility_reasons */,
base::nullopt /* navigation_restart_penalty */); base::nullopt /* navigation_restart_penalty */);
observer()->BroadcastEventToObservers(PreviewsUITabHelper::OptOutEventKey()); observer()->BroadcastEventToObservers(PreviewsUITabHelper::OptOutEventKey());
...@@ -423,7 +497,7 @@ TEST_F(PreviewsUKMObserverTest, LitePageOptOutChip) { ...@@ -423,7 +497,7 @@ TEST_F(PreviewsUKMObserverTest, LitePageOptOutChip) {
2 /* opt_out_value */, false /* origin_opt_out_expected */, 2 /* opt_out_value */, false /* origin_opt_out_expected */,
false /* save_data_enabled_expected */, false /* save_data_enabled_expected */,
false /* offline_preview_expected */, false /* previews_likely */, false /* offline_preview_expected */, false /* previews_likely */,
CoinFlipHoldbackResult::kNotSet, CoinFlipHoldbackResult::kNotSet, {} /* eligibility_reasons */,
base::nullopt /* navigation_restart_penalty */); base::nullopt /* navigation_restart_penalty */);
} }
...@@ -433,7 +507,7 @@ TEST_F(PreviewsUKMObserverTest, LitePageRedirectSeen) { ...@@ -433,7 +507,7 @@ TEST_F(PreviewsUKMObserverTest, LitePageRedirectSeen) {
true /* lite_page_redirect_received */, false /* noscript_on */, true /* lite_page_redirect_received */, false /* noscript_on */,
false /* resource_loading_hints_on */, false /* origin_opt_out */, false /* resource_loading_hints_on */, false /* origin_opt_out */,
false /* save_data_enabled */, false /* is_offline_preview */, false /* save_data_enabled */, false /* is_offline_preview */,
CoinFlipHoldbackResult::kNotSet, CoinFlipHoldbackResult::kNotSet, {} /* eligibility_reasons */,
base::nullopt /* navigation_restart_penalty */); base::nullopt /* navigation_restart_penalty */);
NavigateToUntrackedUrl(); NavigateToUntrackedUrl();
...@@ -446,7 +520,7 @@ TEST_F(PreviewsUKMObserverTest, LitePageRedirectSeen) { ...@@ -446,7 +520,7 @@ TEST_F(PreviewsUKMObserverTest, LitePageRedirectSeen) {
0 /* opt_out_value */, false /* origin_opt_out_expected */, 0 /* opt_out_value */, false /* origin_opt_out_expected */,
false /* save_data_enabled_expected */, false /* save_data_enabled_expected */,
false /* offline_preview_expected */, false /* previews_likely */, false /* offline_preview_expected */, false /* previews_likely */,
CoinFlipHoldbackResult::kNotSet, CoinFlipHoldbackResult::kNotSet, {} /* eligibility_reasons */,
base::nullopt /* navigation_restart_penalty */); base::nullopt /* navigation_restart_penalty */);
} }
...@@ -462,7 +536,7 @@ TEST_F(PreviewsUKMObserverTest, LitePageRedirectOptOut) { ...@@ -462,7 +536,7 @@ TEST_F(PreviewsUKMObserverTest, LitePageRedirectOptOut) {
true /* lite_page_redirect_received */, false /* noscript_on */, true /* lite_page_redirect_received */, false /* noscript_on */,
false /* resource_loading_hints_on */, false /* origin_opt_out */, false /* resource_loading_hints_on */, false /* origin_opt_out */,
false /* save_data_enabled */, false /* is_offline_preview */, false /* save_data_enabled */, false /* is_offline_preview */,
CoinFlipHoldbackResult::kNotSet, CoinFlipHoldbackResult::kNotSet, {} /* eligibility_reasons */,
base::nullopt /* navigation_restart_penalty */); base::nullopt /* navigation_restart_penalty */);
observer()->BroadcastEventToObservers(PreviewsUITabHelper::OptOutEventKey()); observer()->BroadcastEventToObservers(PreviewsUITabHelper::OptOutEventKey());
...@@ -476,7 +550,7 @@ TEST_F(PreviewsUKMObserverTest, LitePageRedirectOptOut) { ...@@ -476,7 +550,7 @@ TEST_F(PreviewsUKMObserverTest, LitePageRedirectOptOut) {
1 /* opt_out_value */, false /* origin_opt_out_expected */, 1 /* opt_out_value */, false /* origin_opt_out_expected */,
false /* save_data_enabled_expected */, false /* save_data_enabled_expected */,
false /* offline_preview_expected */, false /* previews_likely */, false /* offline_preview_expected */, false /* previews_likely */,
CoinFlipHoldbackResult::kNotSet, CoinFlipHoldbackResult::kNotSet, {} /* eligibility_reasons */,
base::nullopt /* navigation_restart_penalty */); base::nullopt /* navigation_restart_penalty */);
} }
...@@ -491,7 +565,7 @@ TEST_F(PreviewsUKMObserverTest, LitePageRedirectOptOutChip) { ...@@ -491,7 +565,7 @@ TEST_F(PreviewsUKMObserverTest, LitePageRedirectOptOutChip) {
true /* lite_page_redirect_received */, false /* noscript_on */, true /* lite_page_redirect_received */, false /* noscript_on */,
false /* resource_loading_hints_on */, false /* origin_opt_out */, false /* resource_loading_hints_on */, false /* origin_opt_out */,
false /* save_data_enabled */, false /* is_offline_preview */, false /* save_data_enabled */, false /* is_offline_preview */,
CoinFlipHoldbackResult::kNotSet, CoinFlipHoldbackResult::kNotSet, {} /* eligibility_reasons */,
base::nullopt /* navigation_restart_penalty */); base::nullopt /* navigation_restart_penalty */);
observer()->BroadcastEventToObservers(PreviewsUITabHelper::OptOutEventKey()); observer()->BroadcastEventToObservers(PreviewsUITabHelper::OptOutEventKey());
...@@ -505,7 +579,7 @@ TEST_F(PreviewsUKMObserverTest, LitePageRedirectOptOutChip) { ...@@ -505,7 +579,7 @@ TEST_F(PreviewsUKMObserverTest, LitePageRedirectOptOutChip) {
2 /* opt_out_value */, false /* origin_opt_out_expected */, 2 /* opt_out_value */, false /* origin_opt_out_expected */,
false /* save_data_enabled_expected */, false /* save_data_enabled_expected */,
false /* offline_preview_expected */, false /* previews_likely */, false /* offline_preview_expected */, false /* previews_likely */,
CoinFlipHoldbackResult::kNotSet, CoinFlipHoldbackResult::kNotSet, {} /* eligibility_reasons */,
base::nullopt /* navigation_restart_penalty */); base::nullopt /* navigation_restart_penalty */);
} }
...@@ -515,7 +589,7 @@ TEST_F(PreviewsUKMObserverTest, NoScriptSeen) { ...@@ -515,7 +589,7 @@ TEST_F(PreviewsUKMObserverTest, NoScriptSeen) {
false /* lite_page_redirect_received */, true /* noscript_on */, false /* lite_page_redirect_received */, true /* noscript_on */,
false /* resource_loading_hints_on */, false /* origin_opt_out */, false /* resource_loading_hints_on */, false /* origin_opt_out */,
false /* save_data_enabled */, false /* is_offline_preview */, false /* save_data_enabled */, false /* is_offline_preview */,
CoinFlipHoldbackResult::kNotSet, CoinFlipHoldbackResult::kNotSet, {} /* eligibility_reasons */,
base::nullopt /* navigation_restart_penalty */); base::nullopt /* navigation_restart_penalty */);
NavigateToUntrackedUrl(); NavigateToUntrackedUrl();
...@@ -527,7 +601,7 @@ TEST_F(PreviewsUKMObserverTest, NoScriptSeen) { ...@@ -527,7 +601,7 @@ TEST_F(PreviewsUKMObserverTest, NoScriptSeen) {
0 /* opt_out_value */, false /* origin_opt_out_expected */, 0 /* opt_out_value */, false /* origin_opt_out_expected */,
false /* save_data_enabled_expected */, false /* save_data_enabled_expected */,
false /* offline_preview_expected */, false /* previews_likely */, false /* offline_preview_expected */, false /* previews_likely */,
CoinFlipHoldbackResult::kNotSet, CoinFlipHoldbackResult::kNotSet, {} /* eligibility_reasons */,
base::nullopt /* navigation_restart_penalty */); base::nullopt /* navigation_restart_penalty */);
} }
...@@ -543,7 +617,7 @@ TEST_F(PreviewsUKMObserverTest, NoScriptOptOut) { ...@@ -543,7 +617,7 @@ TEST_F(PreviewsUKMObserverTest, NoScriptOptOut) {
false /* lite_page_redirect_received */, true /* noscript_on */, false /* lite_page_redirect_received */, true /* noscript_on */,
false /* resource_loading_hints_on */, false /* origin_opt_out */, false /* resource_loading_hints_on */, false /* origin_opt_out */,
false /* save_data_enabled */, false /* is_offline_preview */, false /* save_data_enabled */, false /* is_offline_preview */,
CoinFlipHoldbackResult::kNotSet, CoinFlipHoldbackResult::kNotSet, {} /* eligibility_reasons */,
base::nullopt /* navigation_restart_penalty */); base::nullopt /* navigation_restart_penalty */);
observer()->BroadcastEventToObservers(PreviewsUITabHelper::OptOutEventKey()); observer()->BroadcastEventToObservers(PreviewsUITabHelper::OptOutEventKey());
...@@ -556,7 +630,7 @@ TEST_F(PreviewsUKMObserverTest, NoScriptOptOut) { ...@@ -556,7 +630,7 @@ TEST_F(PreviewsUKMObserverTest, NoScriptOptOut) {
1 /* opt_out_value */, false /* origin_opt_out_expected */, 1 /* opt_out_value */, false /* origin_opt_out_expected */,
false /* save_data_enabled_expected */, false /* save_data_enabled_expected */,
false /* offline_preview_expected */, false /* previews_likely */, false /* offline_preview_expected */, false /* previews_likely */,
CoinFlipHoldbackResult::kNotSet, CoinFlipHoldbackResult::kNotSet, {} /* eligibility_reasons */,
base::nullopt /* navigation_restart_penalty */); base::nullopt /* navigation_restart_penalty */);
} }
...@@ -571,7 +645,7 @@ TEST_F(PreviewsUKMObserverTest, NoScriptOptOutChip) { ...@@ -571,7 +645,7 @@ TEST_F(PreviewsUKMObserverTest, NoScriptOptOutChip) {
false /* lite_page_redirect_received */, true /* noscript_on */, false /* lite_page_redirect_received */, true /* noscript_on */,
false /* resource_loading_hints_on */, false /* origin_opt_out */, false /* resource_loading_hints_on */, false /* origin_opt_out */,
false /* save_data_enabled */, false /* is_offline_preview */, false /* save_data_enabled */, false /* is_offline_preview */,
CoinFlipHoldbackResult::kNotSet, CoinFlipHoldbackResult::kNotSet, {} /* eligibility_reasons */,
base::nullopt /* navigation_restart_penalty */); base::nullopt /* navigation_restart_penalty */);
observer()->BroadcastEventToObservers(PreviewsUITabHelper::OptOutEventKey()); observer()->BroadcastEventToObservers(PreviewsUITabHelper::OptOutEventKey());
...@@ -584,7 +658,7 @@ TEST_F(PreviewsUKMObserverTest, NoScriptOptOutChip) { ...@@ -584,7 +658,7 @@ TEST_F(PreviewsUKMObserverTest, NoScriptOptOutChip) {
2 /* opt_out_value */, false /* origin_opt_out_expected */, 2 /* opt_out_value */, false /* origin_opt_out_expected */,
false /* save_data_enabled_expected */, false /* save_data_enabled_expected */,
false /* offline_preview_expected */, false /* previews_likely */, false /* offline_preview_expected */, false /* previews_likely */,
CoinFlipHoldbackResult::kNotSet, CoinFlipHoldbackResult::kNotSet, {} /* eligibility_reasons */,
base::nullopt /* navigation_restart_penalty */); base::nullopt /* navigation_restart_penalty */);
} }
...@@ -594,7 +668,7 @@ TEST_F(PreviewsUKMObserverTest, OfflinePreviewsSeen) { ...@@ -594,7 +668,7 @@ TEST_F(PreviewsUKMObserverTest, OfflinePreviewsSeen) {
false /* lite_page_redirect_received */, false /* noscript_on */, false /* lite_page_redirect_received */, false /* noscript_on */,
false /* resource_loading_hints_on */, false /* origin_opt_out */, false /* resource_loading_hints_on */, false /* origin_opt_out */,
false /* save_data_enabled */, true /* is_offline_preview */, false /* save_data_enabled */, true /* is_offline_preview */,
CoinFlipHoldbackResult::kNotSet, CoinFlipHoldbackResult::kNotSet, {} /* eligibility_reasons */,
base::nullopt /* navigation_restart_penalty */); base::nullopt /* navigation_restart_penalty */);
NavigateToUntrackedUrl(); NavigateToUntrackedUrl();
...@@ -607,7 +681,7 @@ TEST_F(PreviewsUKMObserverTest, OfflinePreviewsSeen) { ...@@ -607,7 +681,7 @@ TEST_F(PreviewsUKMObserverTest, OfflinePreviewsSeen) {
0 /* opt_out_value */, false /* origin_opt_out_expected */, 0 /* opt_out_value */, false /* origin_opt_out_expected */,
false /* save_data_enabled_expected */, false /* save_data_enabled_expected */,
true /* offline_preview_expected */, false /* previews_likely */, true /* offline_preview_expected */, false /* previews_likely */,
CoinFlipHoldbackResult::kNotSet, CoinFlipHoldbackResult::kNotSet, {} /* eligibility_reasons */,
base::nullopt /* navigation_restart_penalty */); base::nullopt /* navigation_restart_penalty */);
} }
...@@ -617,7 +691,7 @@ TEST_F(PreviewsUKMObserverTest, ResourceLoadingHintsSeen) { ...@@ -617,7 +691,7 @@ TEST_F(PreviewsUKMObserverTest, ResourceLoadingHintsSeen) {
false /* lite_page_redirect_received */, false /* noscript_on */, false /* lite_page_redirect_received */, false /* noscript_on */,
true /* resource_loading_hints_on */, false /* origin_opt_out */, true /* resource_loading_hints_on */, false /* origin_opt_out */,
false /* save_data_enabled */, false /* is_offline_preview */, false /* save_data_enabled */, false /* is_offline_preview */,
CoinFlipHoldbackResult::kNotSet, CoinFlipHoldbackResult::kNotSet, {} /* eligibility_reasons */,
base::nullopt /* navigation_restart_penalty */); base::nullopt /* navigation_restart_penalty */);
NavigateToUntrackedUrl(); NavigateToUntrackedUrl();
...@@ -629,7 +703,7 @@ TEST_F(PreviewsUKMObserverTest, ResourceLoadingHintsSeen) { ...@@ -629,7 +703,7 @@ TEST_F(PreviewsUKMObserverTest, ResourceLoadingHintsSeen) {
0 /* opt_out_value */, false /* origin_opt_out_expected */, 0 /* opt_out_value */, false /* origin_opt_out_expected */,
false /* save_data_enabled_expected */, false /* save_data_enabled_expected */,
false /* offline_preview_expected */, false /* previews_likely */, false /* offline_preview_expected */, false /* previews_likely */,
CoinFlipHoldbackResult::kNotSet, CoinFlipHoldbackResult::kNotSet, {} /* eligibility_reasons */,
base::nullopt /* navigation_restart_penalty */); base::nullopt /* navigation_restart_penalty */);
} }
...@@ -645,7 +719,7 @@ TEST_F(PreviewsUKMObserverTest, ResourceLoadingHintsOptOut) { ...@@ -645,7 +719,7 @@ TEST_F(PreviewsUKMObserverTest, ResourceLoadingHintsOptOut) {
false /* lite_page_redirect_received */, false /* noscript_on */, false /* lite_page_redirect_received */, false /* noscript_on */,
true /* resource_loading_hints_on */, false /* origin_opt_out */, true /* resource_loading_hints_on */, false /* origin_opt_out */,
false /* save_data_enabled */, false /* is_offline_preview */, false /* save_data_enabled */, false /* is_offline_preview */,
CoinFlipHoldbackResult::kNotSet, CoinFlipHoldbackResult::kNotSet, {} /* eligibility_reasons */,
base::nullopt /* navigation_restart_penalty */); base::nullopt /* navigation_restart_penalty */);
observer()->BroadcastEventToObservers(PreviewsUITabHelper::OptOutEventKey()); observer()->BroadcastEventToObservers(PreviewsUITabHelper::OptOutEventKey());
...@@ -658,7 +732,7 @@ TEST_F(PreviewsUKMObserverTest, ResourceLoadingHintsOptOut) { ...@@ -658,7 +732,7 @@ TEST_F(PreviewsUKMObserverTest, ResourceLoadingHintsOptOut) {
1 /* opt_out_value */, false /* origin_opt_out_expected */, 1 /* opt_out_value */, false /* origin_opt_out_expected */,
false /* save_data_enabled_expected */, false /* save_data_enabled_expected */,
false /* offline_preview_expected */, false /* previews_likely */, false /* offline_preview_expected */, false /* previews_likely */,
CoinFlipHoldbackResult::kNotSet, CoinFlipHoldbackResult::kNotSet, {} /* eligibility_reasons */,
base::nullopt /* navigation_restart_penalty */); base::nullopt /* navigation_restart_penalty */);
} }
...@@ -673,7 +747,7 @@ TEST_F(PreviewsUKMObserverTest, ResourceLoadingHintsOptOutChip) { ...@@ -673,7 +747,7 @@ TEST_F(PreviewsUKMObserverTest, ResourceLoadingHintsOptOutChip) {
false /* lite_page_redirect_received */, false /* noscript_on */, false /* lite_page_redirect_received */, false /* noscript_on */,
true /* resource_loading_hints_on */, false /* origin_opt_out */, true /* resource_loading_hints_on */, false /* origin_opt_out */,
false /* save_data_enabled */, false /* is_offline_preview */, false /* save_data_enabled */, false /* is_offline_preview */,
CoinFlipHoldbackResult::kNotSet, CoinFlipHoldbackResult::kNotSet, {} /* eligibility_reasons */,
base::nullopt /* navigation_restart_penalty */); base::nullopt /* navigation_restart_penalty */);
observer()->BroadcastEventToObservers(PreviewsUITabHelper::OptOutEventKey()); observer()->BroadcastEventToObservers(PreviewsUITabHelper::OptOutEventKey());
...@@ -686,7 +760,7 @@ TEST_F(PreviewsUKMObserverTest, ResourceLoadingHintsOptOutChip) { ...@@ -686,7 +760,7 @@ TEST_F(PreviewsUKMObserverTest, ResourceLoadingHintsOptOutChip) {
2 /* opt_out_value */, false /* origin_opt_out_expected */, 2 /* opt_out_value */, false /* origin_opt_out_expected */,
false /* save_data_enabled_expected */, false /* save_data_enabled_expected */,
false /* offline_preview_expected */, false /* previews_likely */, false /* offline_preview_expected */, false /* previews_likely */,
CoinFlipHoldbackResult::kNotSet, CoinFlipHoldbackResult::kNotSet, {} /* eligibility_reasons */,
base::nullopt /* navigation_restart_penalty */); base::nullopt /* navigation_restart_penalty */);
} }
...@@ -696,7 +770,7 @@ TEST_F(PreviewsUKMObserverTest, ClientLoFiSeen) { ...@@ -696,7 +770,7 @@ TEST_F(PreviewsUKMObserverTest, ClientLoFiSeen) {
false /* lite_page_redirect_received */, false /* noscript_on */, false /* lite_page_redirect_received */, false /* noscript_on */,
false /* resource_loading_hints_on */, false /* origin_opt_out */, false /* resource_loading_hints_on */, false /* origin_opt_out */,
false /* save_data_enabled */, false /* is_offline_preview */, false /* save_data_enabled */, false /* is_offline_preview */,
CoinFlipHoldbackResult::kNotSet, CoinFlipHoldbackResult::kNotSet, {} /* eligibility_reasons */,
base::nullopt /* navigation_restart_penalty */); base::nullopt /* navigation_restart_penalty */);
std::unique_ptr<data_reduction_proxy::DataReductionProxyData> data = std::unique_ptr<data_reduction_proxy::DataReductionProxyData> data =
...@@ -731,7 +805,7 @@ TEST_F(PreviewsUKMObserverTest, ClientLoFiSeen) { ...@@ -731,7 +805,7 @@ TEST_F(PreviewsUKMObserverTest, ClientLoFiSeen) {
0 /* opt_out_value */, false /* origin_opt_out_expected */, 0 /* opt_out_value */, false /* origin_opt_out_expected */,
false /* save_data_enabled_expected */, false /* save_data_enabled_expected */,
false /* offline_preview_expected */, false /* previews_likely */, false /* offline_preview_expected */, false /* previews_likely */,
CoinFlipHoldbackResult::kNotSet, CoinFlipHoldbackResult::kNotSet, {} /* eligibility_reasons */,
base::nullopt /* navigation_restart_penalty */); base::nullopt /* navigation_restart_penalty */);
} }
...@@ -747,7 +821,7 @@ TEST_F(PreviewsUKMObserverTest, ClientLoFiOptOut) { ...@@ -747,7 +821,7 @@ TEST_F(PreviewsUKMObserverTest, ClientLoFiOptOut) {
false /* lite_page_redirect_received */, false /* noscript_on */, false /* lite_page_redirect_received */, false /* noscript_on */,
false /* resource_loading_hints_on */, false /* origin_opt_out */, false /* resource_loading_hints_on */, false /* origin_opt_out */,
false /* save_data_enabled */, false /* is_offline_preview */, false /* save_data_enabled */, false /* is_offline_preview */,
CoinFlipHoldbackResult::kNotSet, CoinFlipHoldbackResult::kNotSet, {} /* eligibility_reasons */,
base::nullopt /* navigation_restart_penalty */); base::nullopt /* navigation_restart_penalty */);
std::unique_ptr<data_reduction_proxy::DataReductionProxyData> data = std::unique_ptr<data_reduction_proxy::DataReductionProxyData> data =
...@@ -782,7 +856,7 @@ TEST_F(PreviewsUKMObserverTest, ClientLoFiOptOut) { ...@@ -782,7 +856,7 @@ TEST_F(PreviewsUKMObserverTest, ClientLoFiOptOut) {
1 /* opt_out_value */, false /* origin_opt_out_expected */, 1 /* opt_out_value */, false /* origin_opt_out_expected */,
false /* save_data_enabled_expected */, false /* save_data_enabled_expected */,
false /* offline_preview_expected */, false /* previews_likely */, false /* offline_preview_expected */, false /* previews_likely */,
CoinFlipHoldbackResult::kNotSet, CoinFlipHoldbackResult::kNotSet, {} /* eligibility_reasons */,
base::nullopt /* navigation_restart_penalty */); base::nullopt /* navigation_restart_penalty */);
} }
...@@ -797,7 +871,7 @@ TEST_F(PreviewsUKMObserverTest, ClientLoFiOptOutChip) { ...@@ -797,7 +871,7 @@ TEST_F(PreviewsUKMObserverTest, ClientLoFiOptOutChip) {
false /* lite_page_redirect_received */, false /* noscript_on */, false /* lite_page_redirect_received */, false /* noscript_on */,
false /* resource_loading_hints_on */, false /* origin_opt_out */, false /* resource_loading_hints_on */, false /* origin_opt_out */,
false /* save_data_enabled */, false /* is_offline_preview */, false /* save_data_enabled */, false /* is_offline_preview */,
CoinFlipHoldbackResult::kNotSet, CoinFlipHoldbackResult::kNotSet, {} /* eligibility_reasons */,
base::nullopt /* navigation_restart_penalty */); base::nullopt /* navigation_restart_penalty */);
std::unique_ptr<data_reduction_proxy::DataReductionProxyData> data = std::unique_ptr<data_reduction_proxy::DataReductionProxyData> data =
...@@ -832,7 +906,7 @@ TEST_F(PreviewsUKMObserverTest, ClientLoFiOptOutChip) { ...@@ -832,7 +906,7 @@ TEST_F(PreviewsUKMObserverTest, ClientLoFiOptOutChip) {
2 /* opt_out_value */, false /* origin_opt_out_expected */, 2 /* opt_out_value */, false /* origin_opt_out_expected */,
false /* save_data_enabled_expected */, false /* save_data_enabled_expected */,
false /* offline_preview_expected */, false /* previews_likely */, false /* offline_preview_expected */, false /* previews_likely */,
CoinFlipHoldbackResult::kNotSet, CoinFlipHoldbackResult::kNotSet, {} /* eligibility_reasons */,
base::nullopt /* navigation_restart_penalty */); base::nullopt /* navigation_restart_penalty */);
} }
...@@ -842,7 +916,7 @@ TEST_F(PreviewsUKMObserverTest, ServerLoFiSeen) { ...@@ -842,7 +916,7 @@ TEST_F(PreviewsUKMObserverTest, ServerLoFiSeen) {
false /* lite_page_redirect_received */, false /* noscript_on */, false /* lite_page_redirect_received */, false /* noscript_on */,
false /* resource_loading_hints_on */, false /* origin_opt_out */, false /* resource_loading_hints_on */, false /* origin_opt_out */,
false /* save_data_enabled */, false /* is_offline_preview */, false /* save_data_enabled */, false /* is_offline_preview */,
CoinFlipHoldbackResult::kNotSet, CoinFlipHoldbackResult::kNotSet, {} /* eligibility_reasons */,
base::nullopt /* navigation_restart_penalty */); base::nullopt /* navigation_restart_penalty */);
std::unique_ptr<data_reduction_proxy::DataReductionProxyData> data = std::unique_ptr<data_reduction_proxy::DataReductionProxyData> data =
...@@ -877,7 +951,7 @@ TEST_F(PreviewsUKMObserverTest, ServerLoFiSeen) { ...@@ -877,7 +951,7 @@ TEST_F(PreviewsUKMObserverTest, ServerLoFiSeen) {
0 /* opt_out_value */, false /* origin_opt_out_expected */, 0 /* opt_out_value */, false /* origin_opt_out_expected */,
false /* save_data_enabled_expected */, false /* save_data_enabled_expected */,
false /* offline_preview_expected */, false /* previews_likely */, false /* offline_preview_expected */, false /* previews_likely */,
CoinFlipHoldbackResult::kNotSet, CoinFlipHoldbackResult::kNotSet, {} /* eligibility_reasons */,
base::nullopt /* navigation_restart_penalty */); base::nullopt /* navigation_restart_penalty */);
} }
...@@ -893,7 +967,7 @@ TEST_F(PreviewsUKMObserverTest, ServerLoFiOptOut) { ...@@ -893,7 +967,7 @@ TEST_F(PreviewsUKMObserverTest, ServerLoFiOptOut) {
false /* lite_page_redirect_received */, false /* noscript_on */, false /* lite_page_redirect_received */, false /* noscript_on */,
false /* resource_loading_hints_on */, false /* origin_opt_out */, false /* resource_loading_hints_on */, false /* origin_opt_out */,
false /* save_data_enabled */, false /* is_offline_preview */, false /* save_data_enabled */, false /* is_offline_preview */,
CoinFlipHoldbackResult::kNotSet, CoinFlipHoldbackResult::kNotSet, {} /* eligibility_reasons */,
base::nullopt /* navigation_restart_penalty */); base::nullopt /* navigation_restart_penalty */);
std::unique_ptr<data_reduction_proxy::DataReductionProxyData> data = std::unique_ptr<data_reduction_proxy::DataReductionProxyData> data =
...@@ -929,7 +1003,7 @@ TEST_F(PreviewsUKMObserverTest, ServerLoFiOptOut) { ...@@ -929,7 +1003,7 @@ TEST_F(PreviewsUKMObserverTest, ServerLoFiOptOut) {
1 /* opt_out_value */, false /* origin_opt_out_expected */, 1 /* opt_out_value */, false /* origin_opt_out_expected */,
false /* save_data_enabled_expected */, false /* save_data_enabled_expected */,
false /* offline_preview_expected */, false /* previews_likely */, false /* offline_preview_expected */, false /* previews_likely */,
CoinFlipHoldbackResult::kNotSet, CoinFlipHoldbackResult::kNotSet, {} /* eligibility_reasons */,
base::nullopt /* navigation_restart_penalty */); base::nullopt /* navigation_restart_penalty */);
} }
...@@ -944,7 +1018,7 @@ TEST_F(PreviewsUKMObserverTest, ServerLoFiOptOutChip) { ...@@ -944,7 +1018,7 @@ TEST_F(PreviewsUKMObserverTest, ServerLoFiOptOutChip) {
false /* lite_page_redirect_received */, false /* noscript_on */, false /* lite_page_redirect_received */, false /* noscript_on */,
false /* resource_loading_hints_on */, false /* origin_opt_out */, false /* resource_loading_hints_on */, false /* origin_opt_out */,
false /* save_data_enabled */, false /* is_offline_preview */, false /* save_data_enabled */, false /* is_offline_preview */,
CoinFlipHoldbackResult::kNotSet, CoinFlipHoldbackResult::kNotSet, {} /* eligibility_reasons */,
base::nullopt /* navigation_restart_penalty */); base::nullopt /* navigation_restart_penalty */);
std::unique_ptr<data_reduction_proxy::DataReductionProxyData> data = std::unique_ptr<data_reduction_proxy::DataReductionProxyData> data =
...@@ -980,7 +1054,7 @@ TEST_F(PreviewsUKMObserverTest, ServerLoFiOptOutChip) { ...@@ -980,7 +1054,7 @@ TEST_F(PreviewsUKMObserverTest, ServerLoFiOptOutChip) {
2 /* opt_out_value */, false /* origin_opt_out_expected */, 2 /* opt_out_value */, false /* origin_opt_out_expected */,
false /* save_data_enabled_expected */, false /* save_data_enabled_expected */,
false /* offline_preview_expected */, false /* previews_likely */, false /* offline_preview_expected */, false /* previews_likely */,
CoinFlipHoldbackResult::kNotSet, CoinFlipHoldbackResult::kNotSet, {} /* eligibility_reasons */,
base::nullopt /* navigation_restart_penalty */); base::nullopt /* navigation_restart_penalty */);
} }
...@@ -990,7 +1064,7 @@ TEST_F(PreviewsUKMObserverTest, BothLoFiSeen) { ...@@ -990,7 +1064,7 @@ TEST_F(PreviewsUKMObserverTest, BothLoFiSeen) {
false /* lite_page_redirect_received */, false /* noscript_on */, false /* lite_page_redirect_received */, false /* noscript_on */,
false /* resource_loading_hints_on */, false /* origin_opt_out */, false /* resource_loading_hints_on */, false /* origin_opt_out */,
false /* save_data_enabled */, false /* is_offline_preview */, false /* save_data_enabled */, false /* is_offline_preview */,
CoinFlipHoldbackResult::kNotSet, CoinFlipHoldbackResult::kNotSet, {} /* eligibility_reasons */,
base::nullopt /* navigation_restart_penalty */); base::nullopt /* navigation_restart_penalty */);
std::unique_ptr<data_reduction_proxy::DataReductionProxyData> data1 = std::unique_ptr<data_reduction_proxy::DataReductionProxyData> data1 =
...@@ -1030,7 +1104,7 @@ TEST_F(PreviewsUKMObserverTest, BothLoFiSeen) { ...@@ -1030,7 +1104,7 @@ TEST_F(PreviewsUKMObserverTest, BothLoFiSeen) {
0 /* opt_out_value */, false /* origin_opt_out_expected */, 0 /* opt_out_value */, false /* origin_opt_out_expected */,
false /* save_data_enabled_expected */, false /* save_data_enabled_expected */,
false /* offline_preview_expected */, false /* previews_likely */, false /* offline_preview_expected */, false /* previews_likely */,
CoinFlipHoldbackResult::kNotSet, CoinFlipHoldbackResult::kNotSet, {} /* eligibility_reasons */,
base::nullopt /* navigation_restart_penalty */); base::nullopt /* navigation_restart_penalty */);
} }
...@@ -1046,7 +1120,7 @@ TEST_F(PreviewsUKMObserverTest, BothLoFiOptOut) { ...@@ -1046,7 +1120,7 @@ TEST_F(PreviewsUKMObserverTest, BothLoFiOptOut) {
false /* lite_page_redirect_received */, false /* noscript_on */, false /* lite_page_redirect_received */, false /* noscript_on */,
false /* resource_loading_hints_on */, false /* origin_opt_out */, false /* resource_loading_hints_on */, false /* origin_opt_out */,
false /* save_data_enabled */, false /* is_offline_preview */, false /* save_data_enabled */, false /* is_offline_preview */,
CoinFlipHoldbackResult::kNotSet, CoinFlipHoldbackResult::kNotSet, {} /* eligibility_reasons */,
base::nullopt /* navigation_restart_penalty */); base::nullopt /* navigation_restart_penalty */);
std::unique_ptr<data_reduction_proxy::DataReductionProxyData> data1 = std::unique_ptr<data_reduction_proxy::DataReductionProxyData> data1 =
...@@ -1086,7 +1160,7 @@ TEST_F(PreviewsUKMObserverTest, BothLoFiOptOut) { ...@@ -1086,7 +1160,7 @@ TEST_F(PreviewsUKMObserverTest, BothLoFiOptOut) {
1 /* opt_out_value */, false /* origin_opt_out_expected */, 1 /* opt_out_value */, false /* origin_opt_out_expected */,
false /* save_data_enabled_expected */, false /* save_data_enabled_expected */,
false /* offline_preview_expected */, false /* previews_likely */, false /* offline_preview_expected */, false /* previews_likely */,
CoinFlipHoldbackResult::kNotSet, CoinFlipHoldbackResult::kNotSet, {} /* eligibility_reasons */,
base::nullopt /* navigation_restart_penalty */); base::nullopt /* navigation_restart_penalty */);
} }
...@@ -1101,7 +1175,7 @@ TEST_F(PreviewsUKMObserverTest, BothLoFiOptOutChip) { ...@@ -1101,7 +1175,7 @@ TEST_F(PreviewsUKMObserverTest, BothLoFiOptOutChip) {
false /* lite_page_redirect_received */, false /* noscript_on */, false /* lite_page_redirect_received */, false /* noscript_on */,
false /* resource_loading_hints_on */, false /* origin_opt_out */, false /* resource_loading_hints_on */, false /* origin_opt_out */,
false /* save_data_enabled */, false /* is_offline_preview */, false /* save_data_enabled */, false /* is_offline_preview */,
CoinFlipHoldbackResult::kNotSet, CoinFlipHoldbackResult::kNotSet, {} /* eligibility_reasons */,
base::nullopt /* navigation_restart_penalty */); base::nullopt /* navigation_restart_penalty */);
std::unique_ptr<data_reduction_proxy::DataReductionProxyData> data1 = std::unique_ptr<data_reduction_proxy::DataReductionProxyData> data1 =
...@@ -1141,7 +1215,7 @@ TEST_F(PreviewsUKMObserverTest, BothLoFiOptOutChip) { ...@@ -1141,7 +1215,7 @@ TEST_F(PreviewsUKMObserverTest, BothLoFiOptOutChip) {
2 /* opt_out_value */, false /* origin_opt_out_expected */, 2 /* opt_out_value */, false /* origin_opt_out_expected */,
false /* save_data_enabled_expected */, false /* save_data_enabled_expected */,
false /* offline_preview_expected */, false /* previews_likely */, false /* offline_preview_expected */, false /* previews_likely */,
CoinFlipHoldbackResult::kNotSet, CoinFlipHoldbackResult::kNotSet, {} /* eligibility_reasons */,
base::nullopt /* navigation_restart_penalty */); base::nullopt /* navigation_restart_penalty */);
} }
...@@ -1151,7 +1225,7 @@ TEST_F(PreviewsUKMObserverTest, OriginOptOut) { ...@@ -1151,7 +1225,7 @@ TEST_F(PreviewsUKMObserverTest, OriginOptOut) {
false /* lite_page_redirect_received */, false /* noscript_on */, false /* lite_page_redirect_received */, false /* noscript_on */,
false /* resource_loading_hints_on */, true /* origin_opt_out */, false /* resource_loading_hints_on */, true /* origin_opt_out */,
false /* save_data_enabled */, false /* is_offline_preview */, false /* save_data_enabled */, false /* is_offline_preview */,
CoinFlipHoldbackResult::kNotSet, CoinFlipHoldbackResult::kNotSet, {} /* eligibility_reasons */,
base::nullopt /* navigation_restart_penalty */); base::nullopt /* navigation_restart_penalty */);
NavigateToUntrackedUrl(); NavigateToUntrackedUrl();
...@@ -1164,7 +1238,7 @@ TEST_F(PreviewsUKMObserverTest, OriginOptOut) { ...@@ -1164,7 +1238,7 @@ TEST_F(PreviewsUKMObserverTest, OriginOptOut) {
0 /* opt_out_value */, true /* origin_opt_out_expected */, 0 /* opt_out_value */, true /* origin_opt_out_expected */,
false /* save_data_enabled_expected */, false /* save_data_enabled_expected */,
false /* offline_preview_expected */, false /* previews_likely */, false /* offline_preview_expected */, false /* previews_likely */,
CoinFlipHoldbackResult::kNotSet, CoinFlipHoldbackResult::kNotSet, {} /* eligibility_reasons */,
base::nullopt /* navigation_restart_penalty */); base::nullopt /* navigation_restart_penalty */);
} }
...@@ -1174,7 +1248,7 @@ TEST_F(PreviewsUKMObserverTest, DataSaverEnabled) { ...@@ -1174,7 +1248,7 @@ TEST_F(PreviewsUKMObserverTest, DataSaverEnabled) {
false /* lite_page_redirect_received */, false /* noscript_on */, false /* lite_page_redirect_received */, false /* noscript_on */,
false /* resource_loading_hints_on */, false /* origin_opt_out */, false /* resource_loading_hints_on */, false /* origin_opt_out */,
true /* save_data_enabled */, false /* is_offline_preview */, true /* save_data_enabled */, false /* is_offline_preview */,
CoinFlipHoldbackResult::kNotSet, CoinFlipHoldbackResult::kNotSet, {} /* eligibility_reasons */,
base::nullopt /* navigation_restart_penalty */); base::nullopt /* navigation_restart_penalty */);
NavigateToUntrackedUrl(); NavigateToUntrackedUrl();
...@@ -1187,7 +1261,7 @@ TEST_F(PreviewsUKMObserverTest, DataSaverEnabled) { ...@@ -1187,7 +1261,7 @@ TEST_F(PreviewsUKMObserverTest, DataSaverEnabled) {
0 /* opt_out_value */, false /* origin_opt_out_expected */, 0 /* opt_out_value */, false /* origin_opt_out_expected */,
true /* save_data_enabled_expected */, true /* save_data_enabled_expected */,
false /* offline_preview_expected */, false /* previews_likely */, false /* offline_preview_expected */, false /* previews_likely */,
CoinFlipHoldbackResult::kNotSet, CoinFlipHoldbackResult::kNotSet, {} /* eligibility_reasons */,
base::nullopt /* navigation_restart_penalty */); base::nullopt /* navigation_restart_penalty */);
} }
...@@ -1200,6 +1274,7 @@ TEST_F(PreviewsUKMObserverTest, NavigationRestartPenaltySeen) { ...@@ -1200,6 +1274,7 @@ TEST_F(PreviewsUKMObserverTest, NavigationRestartPenaltySeen) {
false /* noscript_on */, false /* resource_loading_hints_on */, false /* noscript_on */, false /* resource_loading_hints_on */,
false /* origin_opt_out */, false /* save_data_enabled */, false /* origin_opt_out */, false /* save_data_enabled */,
false /* is_offline_preview */, CoinFlipHoldbackResult::kNotSet, false /* is_offline_preview */, CoinFlipHoldbackResult::kNotSet,
{} /* eligibility_reasons */,
base::TimeDelta::FromMilliseconds(1337) /* navigation_restart_penalty */); base::TimeDelta::FromMilliseconds(1337) /* navigation_restart_penalty */);
NavigateToUntrackedUrl(); NavigateToUntrackedUrl();
...@@ -1212,7 +1287,7 @@ TEST_F(PreviewsUKMObserverTest, NavigationRestartPenaltySeen) { ...@@ -1212,7 +1287,7 @@ TEST_F(PreviewsUKMObserverTest, NavigationRestartPenaltySeen) {
false /* origin_opt_out_expected */, false /* origin_opt_out_expected */,
false /* save_data_enabled_expected */, false /* save_data_enabled_expected */,
false /* offline_preview_expected */, false /* previews_likely */, false /* offline_preview_expected */, false /* previews_likely */,
CoinFlipHoldbackResult::kNotSet, CoinFlipHoldbackResult::kNotSet, {} /* eligibility_reasons */,
base::TimeDelta::FromMilliseconds(1337) /* navigation_restart_penalty */); base::TimeDelta::FromMilliseconds(1337) /* navigation_restart_penalty */);
} }
...@@ -1222,7 +1297,7 @@ TEST_F(PreviewsUKMObserverTest, PreviewsLikelySet_PreCommitDecision) { ...@@ -1222,7 +1297,7 @@ TEST_F(PreviewsUKMObserverTest, PreviewsLikelySet_PreCommitDecision) {
false /* lite_page_redirect_received */, false /* noscript_on */, false /* lite_page_redirect_received */, false /* noscript_on */,
false /* resource_loading_hints_on */, false /* origin_opt_out */, false /* resource_loading_hints_on */, false /* origin_opt_out */,
true /* save_data_enabled */, true /* is_offline_preview */, true /* save_data_enabled */, true /* is_offline_preview */,
CoinFlipHoldbackResult::kNotSet, CoinFlipHoldbackResult::kNotSet, {} /* eligibility_reasons */,
base::nullopt /* navigation_restart_penalty */); base::nullopt /* navigation_restart_penalty */);
NavigateToUntrackedUrl(); NavigateToUntrackedUrl();
...@@ -1235,7 +1310,7 @@ TEST_F(PreviewsUKMObserverTest, PreviewsLikelySet_PreCommitDecision) { ...@@ -1235,7 +1310,7 @@ TEST_F(PreviewsUKMObserverTest, PreviewsLikelySet_PreCommitDecision) {
0 /* opt_out_value */, false /* origin_opt_out_expected */, 0 /* opt_out_value */, false /* origin_opt_out_expected */,
true /* save_data_enabled_expected */, true /* save_data_enabled_expected */,
true /* offline_preview_expected */, true /* previews_likely */, true /* offline_preview_expected */, true /* previews_likely */,
CoinFlipHoldbackResult::kNotSet, CoinFlipHoldbackResult::kNotSet, {} /* eligibility_reasons */,
base::nullopt /* navigation_restart_penalty */); base::nullopt /* navigation_restart_penalty */);
} }
...@@ -1245,7 +1320,7 @@ TEST_F(PreviewsUKMObserverTest, PreviewsLikelyNotSet_PostCommitDecision) { ...@@ -1245,7 +1320,7 @@ TEST_F(PreviewsUKMObserverTest, PreviewsLikelyNotSet_PostCommitDecision) {
false /* lite_page_redirect_received */, false /* noscript_on */, false /* lite_page_redirect_received */, false /* noscript_on */,
false /* resource_loading_hints_on */, false /* origin_opt_out */, false /* resource_loading_hints_on */, false /* origin_opt_out */,
true /* save_data_enabled */, false /* is_offline_preview */, true /* save_data_enabled */, false /* is_offline_preview */,
CoinFlipHoldbackResult::kNotSet, CoinFlipHoldbackResult::kNotSet, {} /* eligibility_reasons */,
base::nullopt /* navigation_restart_penalty */); base::nullopt /* navigation_restart_penalty */);
NavigateToUntrackedUrl(); NavigateToUntrackedUrl();
...@@ -1258,7 +1333,7 @@ TEST_F(PreviewsUKMObserverTest, PreviewsLikelyNotSet_PostCommitDecision) { ...@@ -1258,7 +1333,7 @@ TEST_F(PreviewsUKMObserverTest, PreviewsLikelyNotSet_PostCommitDecision) {
0 /* opt_out_value */, false /* origin_opt_out_expected */, 0 /* opt_out_value */, false /* origin_opt_out_expected */,
true /* save_data_enabled_expected */, true /* save_data_enabled_expected */,
false /* offline_preview_expected */, false /* previews_likely */, false /* offline_preview_expected */, false /* previews_likely */,
CoinFlipHoldbackResult::kNotSet, CoinFlipHoldbackResult::kNotSet, {} /* eligibility_reasons */,
base::nullopt /* navigation_restart_penalty */); base::nullopt /* navigation_restart_penalty */);
} }
...@@ -1268,7 +1343,7 @@ TEST_F(PreviewsUKMObserverTest, PreviewsLikelyNotSet_PreviewsOff) { ...@@ -1268,7 +1343,7 @@ TEST_F(PreviewsUKMObserverTest, PreviewsLikelyNotSet_PreviewsOff) {
false /* lite_page_redirect_received */, false /* noscript_on */, false /* lite_page_redirect_received */, false /* noscript_on */,
false /* resource_loading_hints_on */, false /* origin_opt_out */, false /* resource_loading_hints_on */, false /* origin_opt_out */,
true /* save_data_enabled */, false /* is_offline_preview */, true /* save_data_enabled */, false /* is_offline_preview */,
CoinFlipHoldbackResult::kNotSet, CoinFlipHoldbackResult::kNotSet, {} /* eligibility_reasons */,
base::nullopt /* navigation_restart_penalty */); base::nullopt /* navigation_restart_penalty */);
NavigateToUntrackedUrl(); NavigateToUntrackedUrl();
...@@ -1281,7 +1356,7 @@ TEST_F(PreviewsUKMObserverTest, PreviewsLikelyNotSet_PreviewsOff) { ...@@ -1281,7 +1356,7 @@ TEST_F(PreviewsUKMObserverTest, PreviewsLikelyNotSet_PreviewsOff) {
0 /* opt_out_value */, false /* origin_opt_out_expected */, 0 /* opt_out_value */, false /* origin_opt_out_expected */,
true /* save_data_enabled_expected */, true /* save_data_enabled_expected */,
false /* offline_preview_expected */, false /* previews_likely */, false /* offline_preview_expected */, false /* previews_likely */,
CoinFlipHoldbackResult::kNotSet, CoinFlipHoldbackResult::kNotSet, {} /* eligibility_reasons */,
base::nullopt /* navigation_restart_penalty */); base::nullopt /* navigation_restart_penalty */);
} }
...@@ -1291,7 +1366,7 @@ TEST_F(PreviewsUKMObserverTest, CoinFlipResult_Holdback) { ...@@ -1291,7 +1366,7 @@ TEST_F(PreviewsUKMObserverTest, CoinFlipResult_Holdback) {
false /* lite_page_redirect_received */, false /* noscript_on */, false /* lite_page_redirect_received */, false /* noscript_on */,
false /* resource_loading_hints_on */, false /* origin_opt_out */, false /* resource_loading_hints_on */, false /* origin_opt_out */,
true /* save_data_enabled */, true /* is_offline_preview */, true /* save_data_enabled */, true /* is_offline_preview */,
CoinFlipHoldbackResult::kHoldback, CoinFlipHoldbackResult::kHoldback, {} /* eligibility_reasons */,
base::nullopt /* navigation_restart_penalty */); base::nullopt /* navigation_restart_penalty */);
NavigateToUntrackedUrl(); NavigateToUntrackedUrl();
...@@ -1304,7 +1379,7 @@ TEST_F(PreviewsUKMObserverTest, CoinFlipResult_Holdback) { ...@@ -1304,7 +1379,7 @@ TEST_F(PreviewsUKMObserverTest, CoinFlipResult_Holdback) {
0 /* opt_out_value */, false /* origin_opt_out_expected */, 0 /* opt_out_value */, false /* origin_opt_out_expected */,
true /* save_data_enabled_expected */, true /* save_data_enabled_expected */,
true /* offline_preview_expected */, true /* previews_likely */, true /* offline_preview_expected */, true /* previews_likely */,
CoinFlipHoldbackResult::kHoldback, CoinFlipHoldbackResult::kHoldback, {} /* eligibility_reasons */,
base::nullopt /* navigation_restart_penalty */); base::nullopt /* navigation_restart_penalty */);
} }
...@@ -1314,7 +1389,7 @@ TEST_F(PreviewsUKMObserverTest, CoinFlipResult_Allowed) { ...@@ -1314,7 +1389,7 @@ TEST_F(PreviewsUKMObserverTest, CoinFlipResult_Allowed) {
false /* lite_page_redirect_received */, false /* noscript_on */, false /* lite_page_redirect_received */, false /* noscript_on */,
false /* resource_loading_hints_on */, false /* origin_opt_out */, false /* resource_loading_hints_on */, false /* origin_opt_out */,
true /* save_data_enabled */, true /* is_offline_preview */, true /* save_data_enabled */, true /* is_offline_preview */,
CoinFlipHoldbackResult::kAllowed, CoinFlipHoldbackResult::kAllowed, {} /* eligibility_reasons */,
base::nullopt /* navigation_restart_penalty */); base::nullopt /* navigation_restart_penalty */);
NavigateToUntrackedUrl(); NavigateToUntrackedUrl();
...@@ -1327,20 +1402,29 @@ TEST_F(PreviewsUKMObserverTest, CoinFlipResult_Allowed) { ...@@ -1327,20 +1402,29 @@ TEST_F(PreviewsUKMObserverTest, CoinFlipResult_Allowed) {
0 /* opt_out_value */, false /* origin_opt_out_expected */, 0 /* opt_out_value */, false /* origin_opt_out_expected */,
true /* save_data_enabled_expected */, true /* save_data_enabled_expected */,
true /* offline_preview_expected */, true /* previews_likely */, true /* offline_preview_expected */, true /* previews_likely */,
CoinFlipHoldbackResult::kAllowed, CoinFlipHoldbackResult::kAllowed, {} /* eligibility_reasons */,
base::nullopt /* navigation_restart_penalty */); base::nullopt /* navigation_restart_penalty */);
} }
TEST_F(PreviewsUKMObserverTest, CheckReportingForHidden) { TEST_F(PreviewsUKMObserverTest, LogPreviewsEligibilityReason_WithAllowed) {
RunTest(content::PREVIEWS_UNSPECIFIED /* allowed_state */, PreviewsType::NONE, RunTest(content::PREVIEWS_UNSPECIFIED /* allowed_state */, PreviewsType::NONE,
false /* lite_page_received */, false /* lite_page_received */,
false /* lite_page_redirect_received */, false /* noscript_on */, false /* lite_page_redirect_received */, false /* noscript_on */,
false /* resource_loading_hints_on */, false /* origin_opt_out */, false /* resource_loading_hints_on */, false /* origin_opt_out */,
true /* save_data_enabled */, false /* is_offline_preview */, true /* save_data_enabled */, false /* is_offline_preview */,
CoinFlipHoldbackResult::kNotSet, CoinFlipHoldbackResult::kNotSet,
{{PreviewsType::OFFLINE,
PreviewsEligibilityReason::BLACKLIST_UNAVAILABLE},
{PreviewsType::LITE_PAGE,
PreviewsEligibilityReason::BLACKLIST_UNAVAILABLE},
{PreviewsType::NOSCRIPT,
PreviewsEligibilityReason::BLACKLIST_DATA_NOT_LOADED},
// ALLOWED is equal to zero and should not be recorded.
{PreviewsType::LITE_PAGE_REDIRECT,
PreviewsEligibilityReason::ALLOWED}} /* eligibility_reasons */,
base::nullopt /* navigation_restart_penalty */); base::nullopt /* navigation_restart_penalty */);
web_contents()->WasHidden(); NavigateToUntrackedUrl();
ValidateUKM(false /* server_lofi_expected */, ValidateUKM(false /* server_lofi_expected */,
false /* client_lofi_expected */, false /* lite_page_expected */, false /* client_lofi_expected */, false /* lite_page_expected */,
...@@ -1351,19 +1435,35 @@ TEST_F(PreviewsUKMObserverTest, CheckReportingForHidden) { ...@@ -1351,19 +1435,35 @@ TEST_F(PreviewsUKMObserverTest, CheckReportingForHidden) {
true /* save_data_enabled_expected */, true /* save_data_enabled_expected */,
false /* offline_preview_expected */, false /* previews_likely */, false /* offline_preview_expected */, false /* previews_likely */,
CoinFlipHoldbackResult::kNotSet, CoinFlipHoldbackResult::kNotSet,
{{PreviewsType::OFFLINE,
PreviewsEligibilityReason::BLACKLIST_UNAVAILABLE},
{PreviewsType::LITE_PAGE,
PreviewsEligibilityReason::BLACKLIST_UNAVAILABLE},
{PreviewsType::NOSCRIPT,
PreviewsEligibilityReason::
BLACKLIST_DATA_NOT_LOADED}} /* eligibility_reasons */,
base::nullopt /* navigation_restart_penalty */); base::nullopt /* navigation_restart_penalty */);
} }
TEST_F(PreviewsUKMObserverTest, CheckReportingForFlushMetrics) { TEST_F(PreviewsUKMObserverTest, LogPreviewsEligibilityReason_NoneAllowed) {
RunTest(content::PREVIEWS_UNSPECIFIED /* allowed_state */, PreviewsType::NONE, RunTest(content::PREVIEWS_UNSPECIFIED /* allowed_state */, PreviewsType::NONE,
false /* lite_page_received */, false /* lite_page_received */,
false /* lite_page_redirect_received */, false /* noscript_on */, false /* lite_page_redirect_received */, false /* noscript_on */,
false /* resource_loading_hints_on */, false /* origin_opt_out */, false /* resource_loading_hints_on */, false /* origin_opt_out */,
true /* save_data_enabled */, false /* is_offline_preview */, true /* save_data_enabled */, false /* is_offline_preview */,
CoinFlipHoldbackResult::kNotSet, CoinFlipHoldbackResult::kNotSet,
{{PreviewsType::OFFLINE,
PreviewsEligibilityReason::BLACKLIST_UNAVAILABLE},
{PreviewsType::LITE_PAGE,
PreviewsEligibilityReason::BLACKLIST_UNAVAILABLE},
{PreviewsType::NOSCRIPT,
PreviewsEligibilityReason::BLACKLIST_DATA_NOT_LOADED},
{PreviewsType::LITE_PAGE_REDIRECT,
PreviewsEligibilityReason::
BLACKLIST_DATA_NOT_LOADED}} /* eligibility_reasons */,
base::nullopt /* navigation_restart_penalty */); base::nullopt /* navigation_restart_penalty */);
SimulateAppEnterBackground(); NavigateToUntrackedUrl();
ValidateUKM(false /* server_lofi_expected */, ValidateUKM(false /* server_lofi_expected */,
false /* client_lofi_expected */, false /* lite_page_expected */, false /* client_lofi_expected */, false /* lite_page_expected */,
...@@ -1374,6 +1474,61 @@ TEST_F(PreviewsUKMObserverTest, CheckReportingForFlushMetrics) { ...@@ -1374,6 +1474,61 @@ TEST_F(PreviewsUKMObserverTest, CheckReportingForFlushMetrics) {
true /* save_data_enabled_expected */, true /* save_data_enabled_expected */,
false /* offline_preview_expected */, false /* previews_likely */, false /* offline_preview_expected */, false /* previews_likely */,
CoinFlipHoldbackResult::kNotSet, CoinFlipHoldbackResult::kNotSet,
{{PreviewsType::OFFLINE,
PreviewsEligibilityReason::BLACKLIST_UNAVAILABLE},
{PreviewsType::LITE_PAGE,
PreviewsEligibilityReason::BLACKLIST_UNAVAILABLE},
{PreviewsType::NOSCRIPT,
PreviewsEligibilityReason::BLACKLIST_DATA_NOT_LOADED},
{PreviewsType::LITE_PAGE_REDIRECT,
PreviewsEligibilityReason::
BLACKLIST_DATA_NOT_LOADED}} /* eligibility_reasons */,
base::nullopt /* navigation_restart_penalty */);
}
TEST_F(PreviewsUKMObserverTest, CheckReportingForHidden) {
RunTest(content::PREVIEWS_UNSPECIFIED /* allowed_state */, PreviewsType::NONE,
false /* lite_page_received */,
false /* lite_page_redirect_received */, false /* noscript_on */,
false /* resource_loading_hints_on */, false /* origin_opt_out */,
true /* save_data_enabled */, false /* is_offline_preview */,
CoinFlipHoldbackResult::kNotSet, {} /* eligibility_reasons */,
base::nullopt /* navigation_restart_penalty */);
web_contents()->WasHidden();
ValidateUKM(false /* server_lofi_expected */,
false /* client_lofi_expected */, false /* lite_page_expected */,
false /* lite_page_redirect_expected */,
false /* noscript_expected */,
false /* resource_loading_hints_expected */,
0 /* opt_out_value */, false /* origin_opt_out_expected */,
true /* save_data_enabled_expected */,
false /* offline_preview_expected */, false /* previews_likely */,
CoinFlipHoldbackResult::kNotSet, {} /* eligibility_reasons */,
base::nullopt /* navigation_restart_penalty */);
}
TEST_F(PreviewsUKMObserverTest, CheckReportingForFlushMetrics) {
RunTest(content::PREVIEWS_UNSPECIFIED /* allowed_state */, PreviewsType::NONE,
false /* lite_page_received */,
false /* lite_page_redirect_received */, false /* noscript_on */,
false /* resource_loading_hints_on */, false /* origin_opt_out */,
true /* save_data_enabled */, false /* is_offline_preview */,
CoinFlipHoldbackResult::kNotSet, {} /* eligibility_reasons */,
base::nullopt /* navigation_restart_penalty */);
SimulateAppEnterBackground();
ValidateUKM(false /* server_lofi_expected */,
false /* client_lofi_expected */, false /* lite_page_expected */,
false /* lite_page_redirect_expected */,
false /* noscript_expected */,
false /* resource_loading_hints_expected */,
0 /* opt_out_value */, false /* origin_opt_out_expected */,
true /* save_data_enabled_expected */,
false /* offline_preview_expected */, false /* previews_likely */,
CoinFlipHoldbackResult::kNotSet, {} /* eligibility_reasons */,
base::nullopt /* navigation_restart_penalty */); base::nullopt /* navigation_restart_penalty */);
} }
...@@ -1390,7 +1545,7 @@ TEST_F(PreviewsUKMObserverTest, TestPageEndReasonUMA) { ...@@ -1390,7 +1545,7 @@ TEST_F(PreviewsUKMObserverTest, TestPageEndReasonUMA) {
false /* lite_page_redirect_received */, false /* noscript_on */, false /* lite_page_redirect_received */, false /* noscript_on */,
false /* resource_loading_hints_on */, false /* origin_opt_out */, false /* resource_loading_hints_on */, false /* origin_opt_out */,
false /* save_data_enabled */, false /* is_offline_preview */, false /* save_data_enabled */, false /* is_offline_preview */,
CoinFlipHoldbackResult::kNotSet, CoinFlipHoldbackResult::kNotSet, {} /* eligibility_reasons */,
base::nullopt /* navigation_restart_penalty */); base::nullopt /* navigation_restart_penalty */);
NavigateToUntrackedUrl(); NavigateToUntrackedUrl();
......
tools/metrics/ukm/ukm.xml
View file @ 3558bd74
...@@ -5562,6 +5562,14 @@ be describing additional metrics about the same event. ...@@ -5562,6 +5562,14 @@ be describing additional metrics about the same event.
Set to 1 when a user is shown a lite page redirect in page load. Set to 1 when a user is shown a lite page redirect in page load.
</summary> </summary>
</metric> </metric>
<metric name="lite_page_redirect_eligibility_reason">
<summary>
Set to the value of the last known reason a Lite Page Redirect preview was
not eligible on this page load. The value of this metric corresponds to
the PreviewsEligibilityReason enum. This metric is only set when it is
non-zero.
</summary>
</metric>
<metric name="navigation_restart_penalty"> <metric name="navigation_restart_penalty">
<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
...@@ -5574,6 +5582,22 @@ be describing additional metrics about the same event. ...@@ -5574,6 +5582,22 @@ be describing additional metrics about the same event.
Set to 1 when a user is shown a NoScript preview on a page load. Set to 1 when a user is shown a NoScript preview on a page load.
</summary> </summary>
</metric> </metric>
<metric name="noscript_eligibility_reason">
<summary>
Set to the value of the last known reason a NoScript preview was not
eligible on this page load. The value of this metric corresponds to the
PreviewsEligibilityReason enum. This metric is only set when it is
non-zero.
</summary>
</metric>
<metric name="offline_eligibility_reason">
<summary>
Set to the value of the last known reason an Offline preview was not
eligible on this page load. The value of this metric corresponds to the
PreviewsEligibilityReason enum. This metric is only set when it is
non-zero.
</summary>
</metric>
<metric name="offline_preview"> <metric name="offline_preview">
<summary> <summary>
Set to 1 when a user is shown an offline preview page in page load. Set to 1 when a user is shown an offline preview page in page load.
...@@ -5603,12 +5627,28 @@ be describing additional metrics about the same event. ...@@ -5603,12 +5627,28 @@ be describing additional metrics about the same event.
is impacted by the coin flip holdback. is impacted by the coin flip holdback.
</summary> </summary>
</metric> </metric>
<metric name="proxy_lite_page_eligibility_reason">
<summary>
Set to the value of the last known reason a Data Reduction Proxy Lite Page
preview was not eligible on this page load. The value of this metric
corresponds to the PreviewsEligibilityReason enum. This metric is only set
when it is non-zero.
</summary>
</metric>
<metric name="resource_loading_hints"> <metric name="resource_loading_hints">
<summary> <summary>
Set to 1 when a user is shown a resource loading hints based preview on a Set to 1 when a user is shown a resource loading hints based preview on a
page load. page load.
</summary> </summary>
</metric> </metric>
<metric name="resource_loading_hints_eligibility_reason">
<summary>
Set to the value of the last known reason a Resource Loading Hints preview
was not eligible on this page load. The value of this metric corresponds
to the PreviewsEligibilityReason enum. This metric is only set when it is
non-zero.
</summary>
</metric>
<metric name="save_data_enabled"> <metric name="save_data_enabled">
<summary> <summary>
Set to 1 if the data saver feature was enabled in Chrome at the time of Set to 1 if the data saver feature was enabled in Chrome at the time of
......
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