Add new app banner metrics using InstallableStatusCode.

chrome/browser/banners/app_banner_settings_helper_unittest.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <vector>
 
 #include "base/command_line.h"
 #include "chrome/browser/banners/app_banner_metrics.h"
 #include "chrome/browser/banners/app_banner_settings_helper.h"
 #include "chrome/browser/engagement/site_engagement_service.h"
+#include "chrome/browser/installable/installable_logging.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "chrome/test/base/testing_profile.h"
 #include "ui/base/page_transition_types.h"
 
 namespace {
 
 const char kTestURL[] = "https://www.google.com";
 const char kSameOriginTestURL[] = "https://www.google.com/foo.html";
 const char kDifferentOriginTestURL[] = "https://www.example.com";
@@ skipping 485 matching lines @@
   AppBannerSettingsHelper::SetEngagementWeights(2, 0.5);
   GURL url(kTestURL);
   NavigateAndCommit(url);
 
   base::Time reference_time = GetReferenceTime();
   base::Time second_day = reference_time + base::TimeDelta::FromDays(1);
   base::Time third_day = reference_time + base::TimeDelta::FromDays(2);
   base::Time fourth_day = reference_time + base::TimeDelta::FromDays(3);
 
   // By default the banner should not be shown.
-  EXPECT_FALSE(AppBannerSettingsHelper::ShouldShowBanner(
-      web_contents(), url, kTestPackageName, reference_time));
+  EXPECT_EQ(INSUFFICIENT_ENGAGEMENT,
+            AppBannerSettingsHelper::ShouldShowBanner(
+                web_contents(), url, kTestPackageName, reference_time));
 
   // It should take four indirect visits with a weight of 0.5 to trigger the
   // banner.
   AppBannerSettingsHelper::RecordBannerCouldShowEvent(
       web_contents(), url, kTestPackageName, reference_time,
       ui::PAGE_TRANSITION_LINK);
-  EXPECT_FALSE(AppBannerSettingsHelper::ShouldShowBanner(
-      web_contents(), url, kTestPackageName, reference_time));
+  EXPECT_EQ(INSUFFICIENT_ENGAGEMENT,
+            AppBannerSettingsHelper::ShouldShowBanner(
+                web_contents(), url, kTestPackageName, reference_time));
 
   AppBannerSettingsHelper::RecordBannerCouldShowEvent(
       web_contents(), url, kTestPackageName, second_day,
       ui::PAGE_TRANSITION_LINK);
-  EXPECT_FALSE(AppBannerSettingsHelper::ShouldShowBanner(
-      web_contents(), url, kTestPackageName, second_day));
+  EXPECT_EQ(INSUFFICIENT_ENGAGEMENT,
+            AppBannerSettingsHelper::ShouldShowBanner(
+                web_contents(), url, kTestPackageName, second_day));
 
   AppBannerSettingsHelper::RecordBannerCouldShowEvent(
       web_contents(), url, kTestPackageName, third_day,
       ui::PAGE_TRANSITION_FORM_SUBMIT);
-  EXPECT_FALSE(AppBannerSettingsHelper::ShouldShowBanner(
-      web_contents(), url, kTestPackageName, third_day));
+  EXPECT_EQ(INSUFFICIENT_ENGAGEMENT,
+            AppBannerSettingsHelper::ShouldShowBanner(
+                web_contents(), url, kTestPackageName, third_day));
 
   // Visit the site again; now it should be shown.
   AppBannerSettingsHelper::RecordBannerCouldShowEvent(
       web_contents(), url, kTestPackageName, fourth_day,
       ui::PAGE_TRANSITION_MANUAL_SUBFRAME);
-  EXPECT_TRUE(AppBannerSettingsHelper::ShouldShowBanner(
-      web_contents(), url, kTestPackageName, fourth_day));
+  EXPECT_EQ(NO_ERROR_DETECTED,
+            AppBannerSettingsHelper::ShouldShowBanner(
+                web_contents(), url, kTestPackageName, fourth_day));
 }
 
 TEST_F(AppBannerSettingsHelperTest, DirectEngagementWithHigherWeight) {
   AppBannerSettingsHelper::SetEngagementWeights(2, 0.5);
   GURL url(kTestURL);
   NavigateAndCommit(url);
 
   base::Time reference_time = GetReferenceTime();
 
   // By default the banner should not be shown.
-  EXPECT_FALSE(AppBannerSettingsHelper::ShouldShowBanner(
-      web_contents(), url, kTestPackageName, reference_time));
+  EXPECT_EQ(INSUFFICIENT_ENGAGEMENT,
+            AppBannerSettingsHelper::ShouldShowBanner(
+                web_contents(), url, kTestPackageName, reference_time));
 
   // It should take one direct visit with a weight of 2 to trigger the banner.
   AppBannerSettingsHelper::RecordBannerCouldShowEvent(
       web_contents(), url, kTestPackageName, reference_time,
       ui::PAGE_TRANSITION_TYPED);
-  EXPECT_TRUE(AppBannerSettingsHelper::ShouldShowBanner(
-      web_contents(), url, kTestPackageName, reference_time));
+  EXPECT_EQ(NO_ERROR_DETECTED,
+            AppBannerSettingsHelper::ShouldShowBanner(
+                web_contents(), url, kTestPackageName, reference_time));
 }
 
 TEST_F(AppBannerSettingsHelperTest, ShouldShowFromEngagement) {
   GURL url(kTestURL);
   NavigateAndCommit(url);
 
   base::Time reference_time = GetReferenceTime();
   base::Time one_day_ago = reference_time - base::TimeDelta::FromDays(1);
   base::Time one_year_ago = reference_time - base::TimeDelta::FromDays(366);
 
   // By default the banner should not be shown.
-  EXPECT_FALSE(AppBannerSettingsHelper::ShouldShowBanner(
-      web_contents(), url, kTestPackageName, reference_time));
+  EXPECT_EQ(INSUFFICIENT_ENGAGEMENT,
+            AppBannerSettingsHelper::ShouldShowBanner(
+                web_contents(), url, kTestPackageName, reference_time));
 
   // Visit the site once, it still should not be shown.
   AppBannerSettingsHelper::RecordBannerCouldShowEvent(
       web_contents(), url, kTestPackageName, one_year_ago,
       ui::PAGE_TRANSITION_TYPED);
-  EXPECT_FALSE(AppBannerSettingsHelper::ShouldShowBanner(
-      web_contents(), url, kTestPackageName, reference_time));
+  EXPECT_EQ(INSUFFICIENT_ENGAGEMENT,
+            AppBannerSettingsHelper::ShouldShowBanner(
+                web_contents(), url, kTestPackageName, reference_time));
 
   // Visit the site again after a long delay, it still should not be shown.
   AppBannerSettingsHelper::RecordBannerCouldShowEvent(
       web_contents(), url, kTestPackageName, one_day_ago,
       ui::PAGE_TRANSITION_TYPED);
-  EXPECT_FALSE(AppBannerSettingsHelper::ShouldShowBanner(
-      web_contents(), url, kTestPackageName, reference_time));
+  EXPECT_EQ(INSUFFICIENT_ENGAGEMENT,
+            AppBannerSettingsHelper::ShouldShowBanner(
+                web_contents(), url, kTestPackageName, reference_time));
 
   // Visit the site again; now it should be shown.
   AppBannerSettingsHelper::RecordBannerCouldShowEvent(
       web_contents(), url, kTestPackageName, reference_time,
       ui::PAGE_TRANSITION_TYPED);
-  EXPECT_TRUE(AppBannerSettingsHelper::ShouldShowBanner(
-      web_contents(), url, kTestPackageName, reference_time));
+  EXPECT_EQ(NO_ERROR_DETECTED,
+            AppBannerSettingsHelper::ShouldShowBanner(
+                web_contents(), url, kTestPackageName, reference_time));
 }
 
 TEST_F(AppBannerSettingsHelperTest, ShouldNotShowAfterBlocking) {
   GURL url(kTestURL);
   NavigateAndCommit(url);
 
   base::Time reference_time = GetReferenceTime();
   base::Time one_day_ago = reference_time - base::TimeDelta::FromDays(1);
   base::Time two_months_ago = reference_time - base::TimeDelta::FromDays(60);
   base::Time one_year_ago = reference_time - base::TimeDelta::FromDays(366);
 
   // By default the banner should not be shown.
-  EXPECT_FALSE(AppBannerSettingsHelper::ShouldShowBanner(
-      web_contents(), url, kTestPackageName, reference_time));
+  EXPECT_EQ(INSUFFICIENT_ENGAGEMENT,
+            AppBannerSettingsHelper::ShouldShowBanner(
+                web_contents(), url, kTestPackageName, reference_time));
 
   // Record events such that the banner should show.
   AppBannerSettingsHelper::RecordBannerCouldShowEvent(
       web_contents(), url, kTestPackageName, one_day_ago,
       ui::PAGE_TRANSITION_TYPED);
   AppBannerSettingsHelper::RecordBannerCouldShowEvent(
       web_contents(), url, kTestPackageName, reference_time,
       ui::PAGE_TRANSITION_TYPED);
-  EXPECT_TRUE(AppBannerSettingsHelper::ShouldShowBanner(
-      web_contents(), url, kTestPackageName, reference_time));
+  EXPECT_EQ(NO_ERROR_DETECTED,
+            AppBannerSettingsHelper::ShouldShowBanner(
+                web_contents(), url, kTestPackageName, reference_time));
 
   // Block the site a long time ago. It should still be shown.
   AppBannerSettingsHelper::RecordBannerEvent(
       web_contents(), url, kTestPackageName,
       AppBannerSettingsHelper::APP_BANNER_EVENT_DID_BLOCK, one_year_ago);
-  EXPECT_TRUE(AppBannerSettingsHelper::ShouldShowBanner(
-      web_contents(), url, kTestPackageName, reference_time));
+  EXPECT_EQ(NO_ERROR_DETECTED,
+            AppBannerSettingsHelper::ShouldShowBanner(
+                web_contents(), url, kTestPackageName, reference_time));
 
   // Block the site more recently. Now it should not be shown.
   AppBannerSettingsHelper::RecordBannerEvent(
       web_contents(), url, kTestPackageName,
       AppBannerSettingsHelper::APP_BANNER_EVENT_DID_BLOCK, two_months_ago);
-  EXPECT_FALSE(AppBannerSettingsHelper::ShouldShowBanner(
-      web_contents(), url, kTestPackageName, reference_time));
+  EXPECT_EQ(PREVIOUSLY_BLOCKED,
+            AppBannerSettingsHelper::ShouldShowBanner(
+                web_contents(), url, kTestPackageName, reference_time));
 }
 
 TEST_F(AppBannerSettingsHelperTest, ShouldNotShowAfterShowing) {
   GURL url(kTestURL);
   NavigateAndCommit(url);
 
   base::Time reference_time = GetReferenceTime();
   base::Time one_day_ago = reference_time - base::TimeDelta::FromDays(1);
   base::Time three_weeks_ago = reference_time - base::TimeDelta::FromDays(21);
   base::Time one_year_ago = reference_time - base::TimeDelta::FromDays(366);
 
   // By default the banner should not be shown.
-  EXPECT_FALSE(AppBannerSettingsHelper::ShouldShowBanner(
-      web_contents(), url, kTestPackageName, reference_time));
+  EXPECT_EQ(INSUFFICIENT_ENGAGEMENT,
+            AppBannerSettingsHelper::ShouldShowBanner(
+                web_contents(), url, kTestPackageName, reference_time));
 
   // Record events such that the banner should show.
   AppBannerSettingsHelper::RecordBannerCouldShowEvent(
       web_contents(), url, kTestPackageName, one_day_ago,
       ui::PAGE_TRANSITION_TYPED);
   AppBannerSettingsHelper::RecordBannerCouldShowEvent(
       web_contents(), url, kTestPackageName, reference_time,
       ui::PAGE_TRANSITION_TYPED);
-  EXPECT_TRUE(AppBannerSettingsHelper::ShouldShowBanner(
-      web_contents(), url, kTestPackageName, reference_time));
+  EXPECT_EQ(NO_ERROR_DETECTED,
+            AppBannerSettingsHelper::ShouldShowBanner(
+                web_contents(), url, kTestPackageName, reference_time));
 
   // Show the banner a long time ago. It should still be shown.
   AppBannerSettingsHelper::RecordBannerEvent(
       web_contents(), url, kTestPackageName,
       AppBannerSettingsHelper::APP_BANNER_EVENT_DID_SHOW, one_year_ago);
-  EXPECT_TRUE(AppBannerSettingsHelper::ShouldShowBanner(
-      web_contents(), url, kTestPackageName, reference_time));
+  EXPECT_EQ(NO_ERROR_DETECTED,
+            AppBannerSettingsHelper::ShouldShowBanner(
+                web_contents(), url, kTestPackageName, reference_time));
 
   // Show the site more recently. Now it should not be shown.
   AppBannerSettingsHelper::RecordBannerEvent(
       web_contents(), url, kTestPackageName,
       AppBannerSettingsHelper::APP_BANNER_EVENT_DID_SHOW, three_weeks_ago);
-  EXPECT_FALSE(AppBannerSettingsHelper::ShouldShowBanner(
-      web_contents(), url, kTestPackageName, reference_time));
+  EXPECT_EQ(PREVIOUSLY_IGNORED,
+            AppBannerSettingsHelper::ShouldShowBanner(
+                web_contents(), url, kTestPackageName, reference_time));
 }
 
 TEST_F(AppBannerSettingsHelperTest, ShouldNotShowAfterAdding) {
   GURL url(kTestURL);
   NavigateAndCommit(url);
 
   base::Time reference_time = GetReferenceTime();
   base::Time one_day_ago = reference_time - base::TimeDelta::FromDays(1);
   base::Time one_year_ago = reference_time - base::TimeDelta::FromDays(366);
 
   // By default the banner should not be shown.
-  EXPECT_FALSE(AppBannerSettingsHelper::ShouldShowBanner(
-      web_contents(), url, kTestPackageName, reference_time));
+  EXPECT_EQ(INSUFFICIENT_ENGAGEMENT,
+            AppBannerSettingsHelper::ShouldShowBanner(
+                web_contents(), url, kTestPackageName, reference_time));
 
   // Record events such that the banner should show.
   AppBannerSettingsHelper::RecordBannerCouldShowEvent(
       web_contents(), url, kTestPackageName, one_day_ago,
       ui::PAGE_TRANSITION_TYPED);
   AppBannerSettingsHelper::RecordBannerCouldShowEvent(
       web_contents(), url, kTestPackageName, reference_time,
       ui::PAGE_TRANSITION_TYPED);
-  EXPECT_TRUE(AppBannerSettingsHelper::ShouldShowBanner(
-      web_contents(), url, kTestPackageName, reference_time));
+  EXPECT_EQ(NO_ERROR_DETECTED,
+            AppBannerSettingsHelper::ShouldShowBanner(
+                web_contents(), url, kTestPackageName, reference_time));
 
   // Add the site a long time ago. It should not be shown.
   AppBannerSettingsHelper::RecordBannerEvent(
       web_contents(), url, kTestPackageName,
       AppBannerSettingsHelper::APP_BANNER_EVENT_DID_ADD_TO_HOMESCREEN,
       one_year_ago);
-  EXPECT_FALSE(AppBannerSettingsHelper::ShouldShowBanner(
-      web_contents(), url, kTestPackageName, reference_time));
+  EXPECT_EQ(ALREADY_INSTALLED,
+            AppBannerSettingsHelper::ShouldShowBanner(
+                web_contents(), url, kTestPackageName, reference_time));
 }
 
 TEST_F(AppBannerSettingsHelperTest, OperatesOnOrigins) {
   GURL url(kTestURL);
   NavigateAndCommit(url);
 
   base::Time reference_time = GetReferenceTime();
   base::Time one_day_ago = reference_time - base::TimeDelta::FromDays(1);
 
   // By default the banner should not be shown.
-  EXPECT_FALSE(AppBannerSettingsHelper::ShouldShowBanner(
-      web_contents(), url, kTestPackageName, reference_time));
+  EXPECT_EQ(INSUFFICIENT_ENGAGEMENT,
+            AppBannerSettingsHelper::ShouldShowBanner(
+                web_contents(), url, kTestPackageName, reference_time));
 
   // Record events such that the banner should show.
   AppBannerSettingsHelper::RecordBannerCouldShowEvent(
       web_contents(), url, kTestPackageName, one_day_ago,
       ui::PAGE_TRANSITION_TYPED);
   AppBannerSettingsHelper::RecordBannerCouldShowEvent(
       web_contents(), url, kTestPackageName, reference_time,
       ui::PAGE_TRANSITION_TYPED);
 
   // Navigate to another page on the same origin.
   url = GURL(kSameOriginTestURL);
   NavigateAndCommit(url);
 
   // The banner should show as settings are per-origin.
-  EXPECT_TRUE(AppBannerSettingsHelper::ShouldShowBanner(
-      web_contents(), url, kTestPackageName, reference_time));
+  EXPECT_EQ(NO_ERROR_DETECTED,
+            AppBannerSettingsHelper::ShouldShowBanner(
+                web_contents(), url, kTestPackageName, reference_time));
 }
 
 TEST_F(AppBannerSettingsHelperTest, ShouldShowWithHigherTotal) {
   AppBannerSettingsHelper::SetTotalEngagementToTrigger(5);
   GURL url(kTestURL);
   NavigateAndCommit(url);
 
   base::Time reference_time = GetReferenceTime();
   base::Time second_day = reference_time + base::TimeDelta::FromDays(1);
   base::Time third_day = reference_time + base::TimeDelta::FromDays(2);
   base::Time fourth_day = reference_time + base::TimeDelta::FromDays(3);
   base::Time fifth_day = reference_time + base::TimeDelta::FromDays(4);
 
-  EXPECT_FALSE(AppBannerSettingsHelper::ShouldShowBanner(
-      web_contents(), url, kTestPackageName, reference_time));
+  EXPECT_EQ(INSUFFICIENT_ENGAGEMENT,
+            AppBannerSettingsHelper::ShouldShowBanner(
+                web_contents(), url, kTestPackageName, reference_time));
 
   // It should take five visits to trigger the banner.
   AppBannerSettingsHelper::RecordBannerCouldShowEvent(
       web_contents(), url, kTestPackageName, reference_time,
       ui::PAGE_TRANSITION_LINK);
-  EXPECT_FALSE(AppBannerSettingsHelper::ShouldShowBanner(
-      web_contents(), url, kTestPackageName, reference_time));
+  EXPECT_EQ(INSUFFICIENT_ENGAGEMENT,
+            AppBannerSettingsHelper::ShouldShowBanner(
+                web_contents(), url, kTestPackageName, reference_time));
 
   AppBannerSettingsHelper::RecordBannerCouldShowEvent(
       web_contents(), url, kTestPackageName, second_day,
       ui::PAGE_TRANSITION_TYPED);
-  EXPECT_FALSE(AppBannerSettingsHelper::ShouldShowBanner(
-      web_contents(), url, kTestPackageName, second_day));
+  EXPECT_EQ(INSUFFICIENT_ENGAGEMENT,
+            AppBannerSettingsHelper::ShouldShowBanner(
+                web_contents(), url, kTestPackageName, reference_time));
 
   AppBannerSettingsHelper::RecordBannerCouldShowEvent(
       web_contents(), url, kTestPackageName, third_day,
       ui::PAGE_TRANSITION_GENERATED);
-  EXPECT_FALSE(AppBannerSettingsHelper::ShouldShowBanner(
-      web_contents(), url, kTestPackageName, third_day));
+  EXPECT_EQ(INSUFFICIENT_ENGAGEMENT,
+            AppBannerSettingsHelper::ShouldShowBanner(
+                web_contents(), url, kTestPackageName, reference_time));
 
   AppBannerSettingsHelper::RecordBannerCouldShowEvent(
       web_contents(), url, kTestPackageName, fourth_day,
       ui::PAGE_TRANSITION_LINK);
-  EXPECT_FALSE(AppBannerSettingsHelper::ShouldShowBanner(
-      web_contents(), url, kTestPackageName, fourth_day));
+  EXPECT_EQ(INSUFFICIENT_ENGAGEMENT,
+            AppBannerSettingsHelper::ShouldShowBanner(
+                web_contents(), url, kTestPackageName, reference_time));
 
   // Visit the site again; now it should be shown.
   AppBannerSettingsHelper::RecordBannerCouldShowEvent(
       web_contents(), url, kTestPackageName, fifth_day,
       ui::PAGE_TRANSITION_TYPED);
-  EXPECT_TRUE(AppBannerSettingsHelper::ShouldShowBanner(
-      web_contents(), url, kTestPackageName, fifth_day));
+  EXPECT_EQ(NO_ERROR_DETECTED,
+            AppBannerSettingsHelper::ShouldShowBanner(
+                web_contents(), url, kTestPackageName, reference_time));
 }
 
 TEST_F(AppBannerSettingsHelperTest, WasLaunchedRecently) {
   GURL url(kTestURL);
   GURL url_same_origin(kSameOriginTestURL);
   GURL url2(kDifferentOriginTestURL);
   NavigateAndCommit(url);
 
   base::Time reference_time = GetReferenceTime();
   base::Time first_day = reference_time + base::TimeDelta::FromDays(1);
@@ skipping 51 matching lines @@
   EXPECT_TRUE(AppBannerSettingsHelper::WasLaunchedRecently(web_contents(), url,
                                                            first_day));
   EXPECT_TRUE(AppBannerSettingsHelper::WasLaunchedRecently(web_contents(), url,
                                                            ninth_day));
   EXPECT_TRUE(AppBannerSettingsHelper::WasLaunchedRecently(web_contents(), url,
                                                            tenth_day));
   EXPECT_TRUE(AppBannerSettingsHelper::WasLaunchedRecently(web_contents(), url,
                                                             eleventh_day));
 
 }