| Index: chrome/browser/previews/previews_infobar_delegate_unittest.cc
|
| diff --git a/chrome/browser/previews/previews_infobar_delegate_unittest.cc b/chrome/browser/previews/previews_infobar_delegate_unittest.cc
|
| index af0ad75606bbe5408810dffdb362c19f5c3cf1bf..023d105b127d26df8a40f6935cfbb77c15f5a06e 100644
|
| --- a/chrome/browser/previews/previews_infobar_delegate_unittest.cc
|
| +++ b/chrome/browser/previews/previews_infobar_delegate_unittest.cc
|
| @@ -83,9 +83,10 @@ class PreviewsInfoBarDelegateUnitTest : public ChromeRenderViewHostTestHarness {
|
| }
|
|
|
| ConfirmInfoBarDelegate* CreateInfoBar(
|
| - PreviewsInfoBarDelegate::PreviewsInfoBarType type) {
|
| + PreviewsInfoBarDelegate::PreviewsInfoBarType type,
|
| + bool is_data_saver_user) {
|
| PreviewsInfoBarDelegate::Create(
|
| - web_contents(), type,
|
| + web_contents(), type, is_data_saver_user,
|
| base::Bind(&PreviewsInfoBarDelegateUnitTest::OnDismissPreviewsInfobar,
|
| base::Unretained(this)));
|
|
|
| @@ -115,12 +116,13 @@ class PreviewsInfoBarDelegateUnitTest : public ChromeRenderViewHostTestHarness {
|
| TEST_F(PreviewsInfoBarDelegateUnitTest, InfobarTestNavigationDismissal) {
|
| base::HistogramTester tester;
|
|
|
| - CreateInfoBar(PreviewsInfoBarDelegate::LOFI);
|
| + CreateInfoBar(PreviewsInfoBarDelegate::LOFI, true /* is_data_saver_user */);
|
|
|
| // Try showing a second infobar. Another should not be shown since the page
|
| // has not navigated.
|
| PreviewsInfoBarDelegate::Create(
|
| web_contents(), PreviewsInfoBarDelegate::LOFI,
|
| + true /* is_data_saver_user */,
|
| PreviewsInfoBarDelegate::OnDismissPreviewsInfobarCallback());
|
| EXPECT_EQ(1U, infobar_service()->infobar_count());
|
|
|
| @@ -140,8 +142,8 @@ TEST_F(PreviewsInfoBarDelegateUnitTest, InfobarTestNavigationDismissal) {
|
| TEST_F(PreviewsInfoBarDelegateUnitTest, InfobarTestUserDismissal) {
|
| base::HistogramTester tester;
|
|
|
| - ConfirmInfoBarDelegate* infobar =
|
| - CreateInfoBar(PreviewsInfoBarDelegate::LOFI);
|
| + ConfirmInfoBarDelegate* infobar = CreateInfoBar(
|
| + PreviewsInfoBarDelegate::LOFI, true /* is_data_saver_user */);
|
|
|
| // Simulate dismissing the infobar.
|
| infobar->InfoBarDismissed();
|
| @@ -159,8 +161,8 @@ TEST_F(PreviewsInfoBarDelegateUnitTest, InfobarTestUserDismissal) {
|
| TEST_F(PreviewsInfoBarDelegateUnitTest, InfobarTestClickLink) {
|
| base::HistogramTester tester;
|
|
|
| - ConfirmInfoBarDelegate* infobar =
|
| - CreateInfoBar(PreviewsInfoBarDelegate::LOFI);
|
| + ConfirmInfoBarDelegate* infobar = CreateInfoBar(
|
| + PreviewsInfoBarDelegate::LOFI, true /* is_data_saver_user */);
|
|
|
| // Simulate clicking the infobar link.
|
| if (infobar->LinkClicked(WindowOpenDisposition::CURRENT_TAB))
|
| @@ -176,8 +178,8 @@ TEST_F(PreviewsInfoBarDelegateUnitTest, InfobarTestClickLink) {
|
| }
|
|
|
| TEST_F(PreviewsInfoBarDelegateUnitTest, InfobarTestShownOncePerNavigation) {
|
| - ConfirmInfoBarDelegate* infobar =
|
| - CreateInfoBar(PreviewsInfoBarDelegate::LOFI);
|
| + ConfirmInfoBarDelegate* infobar = CreateInfoBar(
|
| + PreviewsInfoBarDelegate::LOFI, true /* is_data_saver_user */);
|
|
|
| // Simulate dismissing the infobar.
|
| infobar->InfoBarDismissed();
|
| @@ -186,6 +188,7 @@ TEST_F(PreviewsInfoBarDelegateUnitTest, InfobarTestShownOncePerNavigation) {
|
|
|
| PreviewsInfoBarDelegate::Create(
|
| web_contents(), PreviewsInfoBarDelegate::LOFI,
|
| + true /* is_data_saver_user */,
|
| PreviewsInfoBarDelegate::OnDismissPreviewsInfobarCallback());
|
|
|
| // Infobar should not be shown again since a navigation hasn't happened.
|
| @@ -194,14 +197,14 @@ TEST_F(PreviewsInfoBarDelegateUnitTest, InfobarTestShownOncePerNavigation) {
|
| // Navigate and show infobar again.
|
| content::WebContentsTester::For(web_contents())
|
| ->NavigateAndCommit(GURL(kTestUrl));
|
| - CreateInfoBar(PreviewsInfoBarDelegate::LOFI);
|
| + CreateInfoBar(PreviewsInfoBarDelegate::LOFI, true /* is_data_saver_user */);
|
| }
|
|
|
| TEST_F(PreviewsInfoBarDelegateUnitTest, LoFiInfobarTest) {
|
| base::HistogramTester tester;
|
|
|
| - ConfirmInfoBarDelegate* infobar =
|
| - CreateInfoBar(PreviewsInfoBarDelegate::LOFI);
|
| + ConfirmInfoBarDelegate* infobar = CreateInfoBar(
|
| + PreviewsInfoBarDelegate::LOFI, true /* is_data_saver_user */);
|
|
|
| tester.ExpectUniqueSample(kUMAPreviewsInfoBarActionLoFi,
|
| PreviewsInfoBarDelegate::INFOBAR_SHOWN, 1);
|
| @@ -223,8 +226,8 @@ TEST_F(PreviewsInfoBarDelegateUnitTest, LoFiInfobarTest) {
|
| TEST_F(PreviewsInfoBarDelegateUnitTest, PreviewInfobarTest) {
|
| base::HistogramTester tester;
|
|
|
| - ConfirmInfoBarDelegate* infobar =
|
| - CreateInfoBar(PreviewsInfoBarDelegate::LITE_PAGE);
|
| + ConfirmInfoBarDelegate* infobar = CreateInfoBar(
|
| + PreviewsInfoBarDelegate::LITE_PAGE, true /* is_data_saver_user */);
|
|
|
| tester.ExpectUniqueSample(kUMAPreviewsInfoBarActionLitePage,
|
| PreviewsInfoBarDelegate::INFOBAR_SHOWN, 1);
|
| @@ -244,11 +247,11 @@ TEST_F(PreviewsInfoBarDelegateUnitTest, PreviewInfobarTest) {
|
| #endif
|
| }
|
|
|
| -TEST_F(PreviewsInfoBarDelegateUnitTest, OfflineInfobarTest) {
|
| +TEST_F(PreviewsInfoBarDelegateUnitTest, OfflineInfobarNonDataSaverUserTest) {
|
| base::HistogramTester tester;
|
|
|
| - ConfirmInfoBarDelegate* infobar =
|
| - CreateInfoBar(PreviewsInfoBarDelegate::OFFLINE);
|
| + ConfirmInfoBarDelegate* infobar = CreateInfoBar(
|
| + PreviewsInfoBarDelegate::OFFLINE, false /* is_data_saver_user */);
|
|
|
| tester.ExpectUniqueSample(kUMAPreviewsInfoBarActionOffline,
|
| PreviewsInfoBarDelegate::INFOBAR_SHOWN, 1);
|
| @@ -267,3 +270,27 @@ TEST_F(PreviewsInfoBarDelegateUnitTest, OfflineInfobarTest) {
|
| ASSERT_EQ(PreviewsInfoBarDelegate::kNoIconID, infobar->GetIconId());
|
| #endif
|
| }
|
| +
|
| +TEST_F(PreviewsInfoBarDelegateUnitTest, OfflineInfobarDataSaverUserTest) {
|
| + base::HistogramTester tester;
|
| +
|
| + ConfirmInfoBarDelegate* infobar = CreateInfoBar(
|
| + PreviewsInfoBarDelegate::OFFLINE, true /* is_data_saver_user */);
|
| +
|
| + tester.ExpectUniqueSample(kUMAPreviewsInfoBarActionOffline,
|
| + PreviewsInfoBarDelegate::INFOBAR_SHOWN, 1);
|
| + EXPECT_EQ(0, drp_test_context_->pref_service()->GetInteger(
|
| + data_reduction_proxy::prefs::kLoFiUIShownPerSession));
|
| +
|
| + // Check the strings.
|
| + ASSERT_TRUE(infobar);
|
| + ASSERT_EQ(l10n_util::GetStringUTF16(IDS_PREVIEWS_INFOBAR_SAVED_DATA_TITLE),
|
| + infobar->GetMessageText());
|
| + ASSERT_EQ(l10n_util::GetStringUTF16(IDS_PREVIEWS_INFOBAR_LINK),
|
| + infobar->GetLinkText());
|
| +#if defined(OS_ANDROID)
|
| + ASSERT_EQ(IDR_ANDROID_INFOBAR_PREVIEWS, infobar->GetIconId());
|
| +#else
|
| + ASSERT_EQ(PreviewsInfoBarDelegate::kNoIconID, infobar->GetIconId());
|
| +#endif
|
| +}
|
|
|