Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/previews/previews_infobar_delegate.h" | 5 #include "chrome/browser/previews/previews_infobar_delegate.h" |
| 6 | 6 |
| 7 #include <memory> | 7 #include <memory> |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| 11 #include "base/bind_helpers.h" | 11 #include "base/bind_helpers.h" |
| 12 #include "base/feature_list.h" | 12 #include "base/feature_list.h" |
| 13 #include "base/memory/ptr_util.h" | 13 #include "base/memory/ptr_util.h" |
| 14 #include "base/metrics/field_trial.h" | 14 #include "base/metrics/field_trial.h" |
| 15 #include "base/metrics/field_trial_param_associator.h" | |
| 15 #include "base/metrics/field_trial_params.h" | 16 #include "base/metrics/field_trial_params.h" |
| 16 #include "base/optional.h" | 17 #include "base/optional.h" |
| 18 #include "base/strings/string16.h" | |
| 17 #include "base/test/histogram_tester.h" | 19 #include "base/test/histogram_tester.h" |
| 18 #include "base/test/scoped_feature_list.h" | 20 #include "base/test/scoped_feature_list.h" |
| 19 #include "base/threading/thread_task_runner_handle.h" | 21 #include "base/threading/thread_task_runner_handle.h" |
| 20 #include "base/time/time.h" | 22 #include "base/time/time.h" |
| 21 #include "chrome/browser/android/android_theme_resources.h" | 23 #include "chrome/browser/android/android_theme_resources.h" |
| 22 #include "chrome/browser/infobars/infobar_service.h" | 24 #include "chrome/browser/infobars/infobar_service.h" |
| 23 #include "chrome/browser/loader/chrome_navigation_data.h" | 25 #include "chrome/browser/loader/chrome_navigation_data.h" |
| 24 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings.h" | 26 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings.h" |
| 25 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings_fact ory.h" | 27 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings_fact ory.h" |
| 26 #include "chrome/browser/previews/previews_infobar_tab_helper.h" | 28 #include "chrome/browser/previews/previews_infobar_tab_helper.h" |
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 64 const char kUMAPreviewsInfoBarActionLoFi[] = "Previews.InfoBarAction.LoFi"; | 66 const char kUMAPreviewsInfoBarActionLoFi[] = "Previews.InfoBarAction.LoFi"; |
| 65 | 67 |
| 66 // Key of the UMA Previews.InfoBarAction.Offline histogram. | 68 // Key of the UMA Previews.InfoBarAction.Offline histogram. |
| 67 const char kUMAPreviewsInfoBarActionOffline[] = | 69 const char kUMAPreviewsInfoBarActionOffline[] = |
| 68 "Previews.InfoBarAction.Offline"; | 70 "Previews.InfoBarAction.Offline"; |
| 69 | 71 |
| 70 // Key of the UMA Previews.InfoBarAction.LitePage histogram. | 72 // Key of the UMA Previews.InfoBarAction.LitePage histogram. |
| 71 const char kUMAPreviewsInfoBarActionLitePage[] = | 73 const char kUMAPreviewsInfoBarActionLitePage[] = |
| 72 "Previews.InfoBarAction.LitePage"; | 74 "Previews.InfoBarAction.LitePage"; |
| 73 | 75 |
| 76 // Key of the UMA Previews.InfoBarTimestamp histogram. | |
| 77 const char kUMAPreviewsInfoBarTimestamp[] = "Previews.InfoBarTimestamp"; | |
| 78 | |
| 74 class TestPreviewsWebContentsObserver | 79 class TestPreviewsWebContentsObserver |
| 75 : public content::WebContentsObserver, | 80 : public content::WebContentsObserver, |
| 76 public content::WebContentsUserData<TestPreviewsWebContentsObserver> { | 81 public content::WebContentsUserData<TestPreviewsWebContentsObserver> { |
| 77 public: | 82 public: |
| 78 explicit TestPreviewsWebContentsObserver(content::WebContents* web_contents) | 83 explicit TestPreviewsWebContentsObserver(content::WebContents* web_contents) |
| 79 : content::WebContentsObserver(web_contents), | 84 : content::WebContentsObserver(web_contents), |
| 80 last_navigation_reload_type_(content::ReloadType::NONE), | 85 last_navigation_reload_type_(content::ReloadType::NONE), |
| 81 should_have_page_id_(true) {} | 86 should_have_page_id_(true) {} |
| 82 ~TestPreviewsWebContentsObserver() override {} | 87 ~TestPreviewsWebContentsObserver() override {} |
| 83 | 88 |
| (...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 171 base::Unretained(this))); | 176 base::Unretained(this))); |
| 172 | 177 |
| 173 InfoBarService* infobar_service = | 178 InfoBarService* infobar_service = |
| 174 InfoBarService::FromWebContents(web_contents()); | 179 InfoBarService::FromWebContents(web_contents()); |
| 175 EXPECT_EQ(1U, infobar_service->infobar_count()); | 180 EXPECT_EQ(1U, infobar_service->infobar_count()); |
| 176 | 181 |
| 177 return static_cast<PreviewsInfoBarDelegate*>( | 182 return static_cast<PreviewsInfoBarDelegate*>( |
| 178 infobar_service->infobar_at(0)->delegate()); | 183 infobar_service->infobar_at(0)->delegate()); |
| 179 } | 184 } |
| 180 | 185 |
| 181 void EnableStalePreviewsTimestamp() { | 186 void EnableStalePreviewsTimestamp( |
| 187 std::map<std::string, std::string> variation_params) { | |
|
tbansal1
2017/06/22 21:12:16
#inclide <map>
megjablon
2017/06/22 23:40:11
Done.
| |
| 188 field_trial_list_.reset(); | |
|
tbansal1
2017/06/22 21:12:16
Is this needed given the following line is also ca
megjablon
2017/06/22 23:40:11
It's needed because otherwise the constructor thro
| |
| 189 field_trial_list_.reset(new base::FieldTrialList(nullptr)); | |
| 190 base::FieldTrialParamAssociator::GetInstance()->ClearAllParamsForTesting(); | |
| 191 | |
| 182 const std::string kTrialName = "TrialName"; | 192 const std::string kTrialName = "TrialName"; |
| 183 const std::string kGroupName = "GroupName"; | 193 const std::string kGroupName = "GroupName"; |
| 184 | 194 |
| 185 std::map<std::string, std::string> variation_params; | |
| 186 variation_params["min_staleness_in_minutes"] = "2"; | |
| 187 variation_params["max_staleness_in_minutes"] = "1440"; | |
| 188 | |
| 189 base::AssociateFieldTrialParams(kTrialName, kGroupName, variation_params); | 195 base::AssociateFieldTrialParams(kTrialName, kGroupName, variation_params); |
| 190 base::FieldTrial* field_trial = | 196 base::FieldTrial* field_trial = |
| 191 base::FieldTrialList::CreateFieldTrial(kTrialName, kGroupName); | 197 base::FieldTrialList::CreateFieldTrial(kTrialName, kGroupName); |
| 192 | 198 |
| 193 std::unique_ptr<base::FeatureList> feature_list(new base::FeatureList); | 199 std::unique_ptr<base::FeatureList> feature_list(new base::FeatureList); |
| 194 feature_list->RegisterFieldTrialOverride( | 200 feature_list->RegisterFieldTrialOverride( |
| 195 previews::features::kStalePreviewsTimestamp.name, | 201 previews::features::kStalePreviewsTimestamp.name, |
| 196 base::FeatureList::OVERRIDE_ENABLE_FEATURE, field_trial); | 202 base::FeatureList::OVERRIDE_ENABLE_FEATURE, field_trial); |
| 197 scoped_feature_list_.InitWithFeatureList(std::move(feature_list)); | 203 scoped_feature_list_.InitWithFeatureList(std::move(feature_list)); |
| 198 } | 204 } |
| (...skipping 403 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 602 ->OptOutsSizeForTesting()); | 608 ->OptOutsSizeForTesting()); |
| 603 | 609 |
| 604 drp_test_context_->RunUntilIdle(); | 610 drp_test_context_->RunUntilIdle(); |
| 605 | 611 |
| 606 EXPECT_EQ(0u, data_reduction_proxy_settings->data_reduction_proxy_service() | 612 EXPECT_EQ(0u, data_reduction_proxy_settings->data_reduction_proxy_service() |
| 607 ->pingback_client() | 613 ->pingback_client() |
| 608 ->OptOutsSizeForTesting()); | 614 ->OptOutsSizeForTesting()); |
| 609 } | 615 } |
| 610 | 616 |
| 611 TEST_F(PreviewsInfoBarDelegateUnitTest, PreviewInfobarTimestampMintuesTest) { | 617 TEST_F(PreviewsInfoBarDelegateUnitTest, PreviewInfobarTimestampMintuesTest) { |
| 612 EnableStalePreviewsTimestamp(); | 618 base::HistogramTester tester; |
| 619 // Use default params. | |
| 620 std::map<std::string, std::string> variation_params; | |
| 621 EnableStalePreviewsTimestamp(variation_params); | |
| 613 | 622 |
| 614 int staleness_in_minutes = 5; | 623 int staleness_in_minutes = 5; |
| 615 | 624 |
| 616 PreviewsInfoBarDelegate* infobar = CreateInfoBar( | 625 PreviewsInfoBarDelegate* infobar = CreateInfoBar( |
| 617 previews::PreviewsType::LITE_PAGE, | 626 previews::PreviewsType::LITE_PAGE, |
| 618 base::Time::Now() - base::TimeDelta::FromMinutes(staleness_in_minutes), | 627 base::Time::Now() - base::TimeDelta::FromMinutes(staleness_in_minutes), |
| 619 true /* is_data_saver_user */); | 628 true /* is_data_saver_user */); |
| 620 | 629 |
| 621 ASSERT_EQ( | 630 EXPECT_EQ( |
| 622 l10n_util::GetStringFUTF16(IDS_PREVIEWS_INFOBAR_TIMESTAMP_MINUTES, | 631 l10n_util::GetStringFUTF16(IDS_PREVIEWS_INFOBAR_TIMESTAMP_MINUTES, |
| 623 base::IntToString16(staleness_in_minutes)), | 632 base::IntToString16(staleness_in_minutes)), |
| 624 infobar->GetTimestampText()); | 633 infobar->GetTimestampText()); |
| 634 tester.ExpectUniqueSample(kUMAPreviewsInfoBarTimestamp, | |
| 635 PreviewsInfoBarDelegate::TIMESTAMP_SHOWN, 1); | |
| 625 } | 636 } |
| 626 | 637 |
| 627 TEST_F(PreviewsInfoBarDelegateUnitTest, PreviewInfobarTimestampHourTest) { | 638 TEST_F(PreviewsInfoBarDelegateUnitTest, PreviewInfobarTimestampHourTest) { |
| 628 EnableStalePreviewsTimestamp(); | 639 base::HistogramTester tester; |
| 640 // Use default params. | |
| 641 std::map<std::string, std::string> variation_params; | |
| 642 EnableStalePreviewsTimestamp(variation_params); | |
| 629 | 643 |
| 630 int staleness_in_minutes = 65; | 644 int staleness_in_minutes = 65; |
| 631 | 645 |
| 632 PreviewsInfoBarDelegate* infobar = CreateInfoBar( | 646 PreviewsInfoBarDelegate* infobar = CreateInfoBar( |
| 633 previews::PreviewsType::LITE_PAGE, | 647 previews::PreviewsType::LITE_PAGE, |
| 634 base::Time::Now() - base::TimeDelta::FromMinutes(staleness_in_minutes), | 648 base::Time::Now() - base::TimeDelta::FromMinutes(staleness_in_minutes), |
| 635 true /* is_data_saver_user */); | 649 true /* is_data_saver_user */); |
| 636 | 650 |
| 637 ASSERT_EQ(l10n_util::GetStringUTF16(IDS_PREVIEWS_INFOBAR_TIMESTAMP_ONE_HOUR), | 651 EXPECT_EQ(l10n_util::GetStringUTF16(IDS_PREVIEWS_INFOBAR_TIMESTAMP_ONE_HOUR), |
| 638 infobar->GetTimestampText()); | 652 infobar->GetTimestampText()); |
| 653 tester.ExpectUniqueSample(kUMAPreviewsInfoBarTimestamp, | |
| 654 PreviewsInfoBarDelegate::TIMESTAMP_SHOWN, 1); | |
| 639 } | 655 } |
| 640 | 656 |
| 641 TEST_F(PreviewsInfoBarDelegateUnitTest, PreviewInfobarTimestampHoursTest) { | 657 TEST_F(PreviewsInfoBarDelegateUnitTest, PreviewInfobarTimestampHoursTest) { |
| 642 EnableStalePreviewsTimestamp(); | 658 base::HistogramTester tester; |
| 659 // Use default params. | |
| 660 std::map<std::string, std::string> variation_params; | |
| 661 EnableStalePreviewsTimestamp(variation_params); | |
| 643 | 662 |
| 644 int staleness_in_hours = 2; | 663 int staleness_in_hours = 2; |
| 645 | 664 |
| 646 PreviewsInfoBarDelegate* infobar = CreateInfoBar( | 665 PreviewsInfoBarDelegate* infobar = CreateInfoBar( |
| 647 previews::PreviewsType::LITE_PAGE, | 666 previews::PreviewsType::LITE_PAGE, |
| 648 base::Time::Now() - base::TimeDelta::FromHours(staleness_in_hours), | 667 base::Time::Now() - base::TimeDelta::FromHours(staleness_in_hours), |
| 649 true /* is_data_saver_user */); | 668 true /* is_data_saver_user */); |
| 650 | 669 |
| 651 ASSERT_EQ(l10n_util::GetStringFUTF16(IDS_PREVIEWS_INFOBAR_TIMESTAMP_HOURS, | 670 EXPECT_EQ(l10n_util::GetStringFUTF16(IDS_PREVIEWS_INFOBAR_TIMESTAMP_HOURS, |
| 652 base::IntToString16(staleness_in_hours)), | 671 base::IntToString16(staleness_in_hours)), |
| 653 infobar->GetTimestampText()); | 672 infobar->GetTimestampText()); |
| 673 tester.ExpectUniqueSample(kUMAPreviewsInfoBarTimestamp, | |
| 674 PreviewsInfoBarDelegate::TIMESTAMP_SHOWN, 1); | |
| 654 } | 675 } |
| 676 | |
| 677 TEST_F(PreviewsInfoBarDelegateUnitTest, PreviewInfobarTimestampFinchParamsUMA) { | |
| 678 base::HistogramTester tester; | |
| 679 std::map<std::string, std::string> variation_params; | |
| 680 variation_params["min_staleness_in_minutes"] = "1"; | |
| 681 variation_params["max_staleness_in_minutes"] = "5"; | |
| 682 EnableStalePreviewsTimestamp(variation_params); | |
| 683 | |
| 684 int staleness_in_minutes = 1; | |
| 685 | |
| 686 PreviewsInfoBarDelegate* infobar = CreateInfoBar( | |
| 687 previews::PreviewsType::LITE_PAGE, | |
| 688 base::Time::Now() - base::TimeDelta::FromMinutes(staleness_in_minutes), | |
| 689 true /* is_data_saver_user */); | |
| 690 | |
| 691 EXPECT_EQ( | |
| 692 l10n_util::GetStringFUTF16(IDS_PREVIEWS_INFOBAR_TIMESTAMP_MINUTES, | |
| 693 base::IntToString16(staleness_in_minutes)), | |
| 694 infobar->GetTimestampText()); | |
| 695 tester.ExpectBucketCount(kUMAPreviewsInfoBarTimestamp, | |
| 696 PreviewsInfoBarDelegate::TIMESTAMP_SHOWN, 1); | |
| 697 | |
| 698 // Navigate and show infobar again. | |
| 699 NavigateAndCommit(GURL(kTestUrl)); | |
| 700 | |
| 701 staleness_in_minutes = 6; | |
| 702 | |
| 703 infobar = CreateInfoBar( | |
| 704 previews::PreviewsType::LITE_PAGE, | |
| 705 base::Time::Now() - base::TimeDelta::FromMinutes(staleness_in_minutes), | |
| 706 true /* is_data_saver_user */); | |
| 707 | |
| 708 EXPECT_EQ(base::string16(), infobar->GetTimestampText()); | |
| 709 tester.ExpectBucketCount( | |
| 710 kUMAPreviewsInfoBarTimestamp, | |
| 711 PreviewsInfoBarDelegate::TIMESTAMP_NOT_SHOWN_STALENESS_GREATER_THAN_MAX, | |
| 712 1); | |
| 713 } | |
| 714 | |
| 715 TEST_F(PreviewsInfoBarDelegateUnitTest, PreviewInfobarTimestampNoParamsUMA) { | |
| 716 base::HistogramTester tester; | |
| 717 std::map<std::string, std::string> variation_params; | |
| 718 variation_params["min_staleness_in_minutes"] = "-5"; | |
| 719 variation_params["max_staleness_in_minutes"] = "1440"; | |
| 720 EnableStalePreviewsTimestamp(variation_params); | |
| 721 | |
| 722 int staleness_in_minutes = 5; | |
| 723 | |
| 724 PreviewsInfoBarDelegate* infobar = CreateInfoBar( | |
| 725 previews::PreviewsType::LITE_PAGE, | |
| 726 base::Time::Now() - base::TimeDelta::FromMinutes(staleness_in_minutes), | |
| 727 true /* is_data_saver_user */); | |
| 728 | |
| 729 EXPECT_EQ(base::string16(), infobar->GetTimestampText()); | |
| 730 tester.ExpectUniqueSample( | |
| 731 kUMAPreviewsInfoBarTimestamp, | |
| 732 PreviewsInfoBarDelegate::TIMESTAMP_NOT_SHOWN_PARAMS_NOT_AVAILABLE, 1); | |
| 733 } | |
| 734 | |
| 735 TEST_F(PreviewsInfoBarDelegateUnitTest, PreviewInfobarTimestampNotStaleUMA) { | |
| 736 base::HistogramTester tester; | |
| 737 // Use default params. | |
| 738 std::map<std::string, std::string> variation_params; | |
| 739 EnableStalePreviewsTimestamp(variation_params); | |
| 740 | |
| 741 int staleness_in_minutes = 1; | |
| 742 | |
| 743 PreviewsInfoBarDelegate* infobar = CreateInfoBar( | |
| 744 previews::PreviewsType::LITE_PAGE, | |
| 745 base::Time::Now() - base::TimeDelta::FromMinutes(staleness_in_minutes), | |
| 746 true /* is_data_saver_user */); | |
| 747 ASSERT_EQ(base::string16(), infobar->GetTimestampText()); | |
| 748 tester.ExpectUniqueSample( | |
| 749 kUMAPreviewsInfoBarTimestamp, | |
| 750 PreviewsInfoBarDelegate::TIMESTAMP_NOT_SHOWN_PREVIEW_NOT_STALE, 1); | |
| 751 } | |
| 752 | |
| 753 TEST_F(PreviewsInfoBarDelegateUnitTest, PreviewInfobarTimestampNegativeUMA) { | |
| 754 base::HistogramTester tester; | |
| 755 // Use default params. | |
| 756 std::map<std::string, std::string> variation_params; | |
| 757 EnableStalePreviewsTimestamp(variation_params); | |
| 758 | |
| 759 int staleness_in_minutes = -1; | |
| 760 | |
| 761 PreviewsInfoBarDelegate* infobar = CreateInfoBar( | |
| 762 previews::PreviewsType::LITE_PAGE, | |
| 763 base::Time::Now() - base::TimeDelta::FromMinutes(staleness_in_minutes), | |
| 764 true /* is_data_saver_user */); | |
| 765 EXPECT_EQ(base::string16(), infobar->GetTimestampText()); | |
| 766 tester.ExpectUniqueSample( | |
| 767 kUMAPreviewsInfoBarTimestamp, | |
| 768 PreviewsInfoBarDelegate::TIMESTAMP_NOT_SHOWN_STALENESS_NEGATIVE, 1); | |
| 769 } | |
| 770 | |
| 771 TEST_F(PreviewsInfoBarDelegateUnitTest, PreviewInfobarTimestampMaximumUMA) { | |
|
tbansal1
2017/06/22 21:12:16
Would it be useful to combine this test with the o
megjablon
2017/06/22 23:40:11
I refactored the tests. I didn't add a struct thou
tbansal1
2017/06/23 00:37:42
Thanks, this looks much cleaner.
| |
| 772 base::HistogramTester tester; | |
| 773 // Use default params. | |
| 774 std::map<std::string, std::string> variation_params; | |
| 775 EnableStalePreviewsTimestamp(variation_params); | |
| 776 | |
| 777 int staleness_in_minutes = 1500; | |
| 778 | |
| 779 PreviewsInfoBarDelegate* infobar = CreateInfoBar( | |
| 780 previews::PreviewsType::LITE_PAGE, | |
| 781 base::Time::Now() - base::TimeDelta::FromMinutes(staleness_in_minutes), | |
| 782 true /* is_data_saver_user */); | |
| 783 EXPECT_EQ(base::string16(), infobar->GetTimestampText()); | |
| 784 tester.ExpectUniqueSample( | |
| 785 kUMAPreviewsInfoBarTimestamp, | |
| 786 PreviewsInfoBarDelegate::TIMESTAMP_NOT_SHOWN_STALENESS_GREATER_THAN_MAX, | |
| 787 1); | |
| 788 } | |
| OLD | NEW |