Add UMA metrics to the site engagement service.

chrome/browser/engagement/site_engagement_service_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 "base/command_line.h"
+#include "base/test/histogram_tester.h"
 #include "base/test/simple_test_clock.h"
 #include "base/values.h"
 #include "chrome/browser/engagement/site_engagement_helper.h"
+#include "chrome/browser/engagement/site_engagement_metrics.h"
 #include "chrome/browser/engagement/site_engagement_service.h"
 #include "chrome/browser/engagement/site_engagement_service_factory.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/browser_with_test_window_test.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
 const int kLessAccumulationsThanNeededToMaxDailyEngagement = 2;
 const int kMoreAccumulationsThanNeededToMaxDailyEngagement = 40;
@@ skipping 319 matching lines @@
   EXPECT_LT(prev_score, service->GetScore(url));
   prev_score = service->GetScore(url);
 
   NavigateAndCommitActiveTab(url);
   EXPECT_LT(prev_score, service->GetScore(url));
 }
 
 // Expect that site engagement scores for several sites are correctly aggregated
 // by GetTotalEngagementPoints().
 TEST_F(SiteEngagementServiceTest, GetTotalNavigationPoints) {
-  SiteEngagementService* service =
-      SiteEngagementServiceFactory::GetForProfile(profile());
-  DCHECK(service);
+  base::SimpleTestClock* clock = new base::SimpleTestClock();
+  scoped_ptr<SiteEngagementService> service(
+      new SiteEngagementService(profile(), make_scoped_ptr(clock)));
+
+  base::Time current_day = GetReferenceTime();
+  clock->SetNow(current_day);
+
+  base::HistogramTester histograms;
+
+  // Histograms should start empty.
+  histograms.ExpectTotalCount(SiteEngagementMetrics::kEngagementTypeHistogram,
+                              0);
+  histograms.ExpectTotalCount(
+      SiteEngagementMetrics::kOriginsWithMaxDailyEngagementHistogram, 0);
+  histograms.ExpectTotalCount(
+      SiteEngagementMetrics::kOriginsWithMaxEngagementHistogram, 0);
 
   // The https and http versions of www.google.com should be separate.
   GURL url1("https://www.google.com/");
   GURL url2("http://www.google.com/");
   GURL url3("http://drive.google.com/");
 
   EXPECT_EQ(0, service->GetScore(url1));
   EXPECT_EQ(0, service->GetScore(url2));
   EXPECT_EQ(0, service->GetScore(url3));
 
   service->HandleNavigation(url1, ui::PAGE_TRANSITION_TYPED);
   EXPECT_EQ(0.5, service->GetScore(url1));
   EXPECT_EQ(0.5, service->GetTotalEngagementPoints());
+  histograms.ExpectTotalCount(SiteEngagementMetrics::kEngagementTypeHistogram,
+                              1);
+  histograms.ExpectBucketCount(SiteEngagementMetrics::kEngagementTypeHistogram,
+                               SiteEngagementMetrics::ENGAGEMENT_NAVIGATION, 1);
+  histograms.ExpectTotalCount(
+      SiteEngagementMetrics::kOriginsWithMaxDailyEngagementHistogram, 1);
+  histograms.ExpectBucketCount(
+      SiteEngagementMetrics::kOriginsWithMaxDailyEngagementHistogram, 0, 1);
+  histograms.ExpectTotalCount(
+      SiteEngagementMetrics::kOriginsWithMaxEngagementHistogram, 1);
+  histograms.ExpectBucketCount(
+      SiteEngagementMetrics::kOriginsWithMaxEngagementHistogram, 0, 1);
+
+  clock->SetNow(GetReferenceTime() + base::TimeDelta::FromMinutes(59));
 
   service->HandleNavigation(url2, ui::PAGE_TRANSITION_GENERATED);
   service->HandleNavigation(url2, ui::PAGE_TRANSITION_AUTO_TOPLEVEL);
   EXPECT_EQ(1, service->GetScore(url2));
   EXPECT_EQ(1.5, service->GetTotalEngagementPoints());
+  histograms.ExpectTotalCount(SiteEngagementMetrics::kEngagementTypeHistogram,
+                              3);
+  histograms.ExpectBucketCount(SiteEngagementMetrics::kEngagementTypeHistogram,
+                               SiteEngagementMetrics::ENGAGEMENT_NAVIGATION, 3);
+  histograms.ExpectTotalCount(
+      SiteEngagementMetrics::kOriginsWithMaxDailyEngagementHistogram, 1);
+  histograms.ExpectTotalCount(
+      SiteEngagementMetrics::kOriginsWithMaxEngagementHistogram, 1);
+
+  clock->SetNow(GetReferenceTime() + base::TimeDelta::FromMinutes(60));
 
   service->HandleNavigation(url3, ui::PAGE_TRANSITION_TYPED);
   EXPECT_EQ(0.5, service->GetScore(url3));
   EXPECT_EQ(2, service->GetTotalEngagementPoints());
+  histograms.ExpectTotalCount(SiteEngagementMetrics::kEngagementTypeHistogram,
+                              4);
+  histograms.ExpectBucketCount(SiteEngagementMetrics::kEngagementTypeHistogram,
+                               SiteEngagementMetrics::ENGAGEMENT_NAVIGATION, 4);
+  histograms.ExpectTotalCount(
+      SiteEngagementMetrics::kOriginsWithMaxDailyEngagementHistogram, 2);
+  histograms.ExpectTotalCount(
+      SiteEngagementMetrics::kOriginsWithMaxEngagementHistogram, 2);
 
   service->HandleNavigation(url1, ui::PAGE_TRANSITION_GENERATED);
   service->HandleNavigation(url1, ui::PAGE_TRANSITION_TYPED);
   EXPECT_EQ(1.5, service->GetScore(url1));
   EXPECT_EQ(3, service->GetTotalEngagementPoints());
+  histograms.ExpectTotalCount(SiteEngagementMetrics::kEngagementTypeHistogram,
+                              6);
+  histograms.ExpectBucketCount(SiteEngagementMetrics::kEngagementTypeHistogram,
+                               SiteEngagementMetrics::ENGAGEMENT_NAVIGATION, 6);
+  histograms.ExpectTotalCount(
+      SiteEngagementMetrics::kOriginsWithMaxDailyEngagementHistogram, 2);
+  histograms.ExpectBucketCount(
+      SiteEngagementMetrics::kOriginsWithMaxDailyEngagementHistogram, 0, 2);
+  histograms.ExpectTotalCount(
+      SiteEngagementMetrics::kOriginsWithMaxEngagementHistogram, 2);
+  histograms.ExpectBucketCount(
+      SiteEngagementMetrics::kOriginsWithMaxEngagementHistogram, 0, 2);
+
+  // Advance an origin to the max for a day and advance the clock an hour before
+  // the last increment before max. Expect the histogram to be updated.
+  for (int i = 0; i < 6; ++i)
+    service->HandleNavigation(url1, ui::PAGE_TRANSITION_TYPED);
+
+  clock->SetNow(GetReferenceTime() + base::TimeDelta::FromMinutes(121));
+  service->HandleNavigation(url1, ui::PAGE_TRANSITION_TYPED);
+
+  histograms.ExpectTotalCount(SiteEngagementMetrics::kEngagementTypeHistogram,
+                              13);
+  histograms.ExpectTotalCount(
+      SiteEngagementMetrics::kOriginsWithMaxDailyEngagementHistogram, 3);
+  histograms.ExpectBucketCount(
+      SiteEngagementMetrics::kOriginsWithMaxDailyEngagementHistogram, 0, 2);
+  histograms.ExpectBucketCount(
+      SiteEngagementMetrics::kOriginsWithMaxDailyEngagementHistogram, 1, 1);
+  histograms.ExpectTotalCount(
+      SiteEngagementMetrics::kOriginsWithMaxEngagementHistogram, 3);
+  histograms.ExpectBucketCount(
+      SiteEngagementMetrics::kOriginsWithMaxEngagementHistogram, 0, 3);
 }
 
 TEST_F(SiteEngagementServiceTest, GetTotalUserInputPoints) {
-  SiteEngagementService* service =
-      SiteEngagementServiceFactory::GetForProfile(profile());
-  DCHECK(service);
+  base::SimpleTestClock* clock = new base::SimpleTestClock();
+  scoped_ptr<SiteEngagementService> service(
+      new SiteEngagementService(profile(), make_scoped_ptr(clock)));
+
+  base::Time current_day = GetReferenceTime();
+  clock->SetNow(current_day);
+
+  base::HistogramTester histograms;
+
+  // Histograms should start off empty.
+  histograms.ExpectTotalCount(SiteEngagementMetrics::kEngagementTypeHistogram,
+                              0);
+  histograms.ExpectTotalCount(
+      SiteEngagementMetrics::kOriginsWithMaxDailyEngagementHistogram, 0);
+  histograms.ExpectTotalCount(
+      SiteEngagementMetrics::kOriginsWithMaxEngagementHistogram, 0);
 
   // The https and http versions of www.google.com should be separate.
   GURL url1("https://www.google.com/");
   GURL url2("http://www.google.com/");
   GURL url3("http://drive.google.com/");
 
   EXPECT_EQ(0, service->GetScore(url1));
   EXPECT_EQ(0, service->GetScore(url2));
   EXPECT_EQ(0, service->GetScore(url3));
 
-  service->HandleUserInput(url1);
+  service->HandleUserInput(url1, SiteEngagementMetrics::ENGAGEMENT_MOUSE);
   EXPECT_DOUBLE_EQ(0.05, service->GetScore(url1));
   EXPECT_DOUBLE_EQ(0.05, service->GetTotalEngagementPoints());
+  histograms.ExpectTotalCount(SiteEngagementMetrics::kEngagementTypeHistogram,
+                              1);
+  histograms.ExpectBucketCount(SiteEngagementMetrics::kEngagementTypeHistogram,
+                               SiteEngagementMetrics::ENGAGEMENT_MOUSE, 1);
+  histograms.ExpectTotalCount(
+      SiteEngagementMetrics::kOriginsWithMaxDailyEngagementHistogram, 1);
+  histograms.ExpectBucketCount(
+      SiteEngagementMetrics::kOriginsWithMaxDailyEngagementHistogram, 0, 1);
+  histograms.ExpectTotalCount(
+      SiteEngagementMetrics::kOriginsWithMaxEngagementHistogram, 1);
+  histograms.ExpectBucketCount(
+      SiteEngagementMetrics::kOriginsWithMaxEngagementHistogram, 0, 1);
 
-  service->HandleUserInput(url2);
-  service->HandleUserInput(url2);
+  clock->SetNow(GetReferenceTime() + base::TimeDelta::FromMinutes(45));
+  service->HandleUserInput(url2, SiteEngagementMetrics::ENGAGEMENT_MOUSE);
+  clock->SetNow(GetReferenceTime() + base::TimeDelta::FromMinutes(60));
+  service->HandleUserInput(url2, SiteEngagementMetrics::ENGAGEMENT_KEYPRESS);
   EXPECT_DOUBLE_EQ(0.1, service->GetScore(url2));
   EXPECT_DOUBLE_EQ(0.15, service->GetTotalEngagementPoints());
+  histograms.ExpectTotalCount(SiteEngagementMetrics::kEngagementTypeHistogram,
+                              3);
+  histograms.ExpectBucketCount(SiteEngagementMetrics::kEngagementTypeHistogram,
+                               SiteEngagementMetrics::ENGAGEMENT_MOUSE, 2);
+  histograms.ExpectBucketCount(SiteEngagementMetrics::kEngagementTypeHistogram,
+                               SiteEngagementMetrics::ENGAGEMENT_KEYPRESS, 1);
+  histograms.ExpectTotalCount(
+      SiteEngagementMetrics::kOriginsWithMaxDailyEngagementHistogram, 2);
+  histograms.ExpectBucketCount(
+      SiteEngagementMetrics::kOriginsWithMaxDailyEngagementHistogram, 0, 2);
+  histograms.ExpectTotalCount(
+      SiteEngagementMetrics::kOriginsWithMaxEngagementHistogram, 2);
+  histograms.ExpectBucketCount(
+      SiteEngagementMetrics::kOriginsWithMaxEngagementHistogram, 0, 2);
 
-  service->HandleUserInput(url3);
+  clock->SetNow(GetReferenceTime() + base::TimeDelta::FromMinutes(150));
+  service->HandleUserInput(url3, SiteEngagementMetrics::ENGAGEMENT_KEYPRESS);
   EXPECT_DOUBLE_EQ(0.05, service->GetScore(url3));
   EXPECT_DOUBLE_EQ(0.2, service->GetTotalEngagementPoints());
+  histograms.ExpectTotalCount(SiteEngagementMetrics::kEngagementTypeHistogram,
+                              4);
+  histograms.ExpectBucketCount(SiteEngagementMetrics::kEngagementTypeHistogram,
+                               SiteEngagementMetrics::ENGAGEMENT_KEYPRESS, 2);
+  histograms.ExpectTotalCount(
+      SiteEngagementMetrics::kOriginsWithMaxDailyEngagementHistogram, 3);
+  histograms.ExpectBucketCount(
+      SiteEngagementMetrics::kOriginsWithMaxDailyEngagementHistogram, 0, 3);
+  histograms.ExpectTotalCount(
+      SiteEngagementMetrics::kOriginsWithMaxEngagementHistogram, 3);
+  histograms.ExpectBucketCount(
+      SiteEngagementMetrics::kOriginsWithMaxEngagementHistogram, 0, 3);
 
-  service->HandleUserInput(url1);
-  service->HandleUserInput(url1);
+  service->HandleUserInput(url1, SiteEngagementMetrics::ENGAGEMENT_KEYPRESS);
+  service->HandleUserInput(url1, SiteEngagementMetrics::ENGAGEMENT_MOUSE);
   EXPECT_DOUBLE_EQ(0.15, service->GetScore(url1));
   EXPECT_DOUBLE_EQ(0.3, service->GetTotalEngagementPoints());
+  histograms.ExpectTotalCount(SiteEngagementMetrics::kEngagementTypeHistogram,
+                              6);
+  histograms.ExpectBucketCount(SiteEngagementMetrics::kEngagementTypeHistogram,
+                               SiteEngagementMetrics::ENGAGEMENT_MOUSE, 3);
+  histograms.ExpectBucketCount(SiteEngagementMetrics::kEngagementTypeHistogram,
+                               SiteEngagementMetrics::ENGAGEMENT_KEYPRESS, 3);
+
+  // Advance an origin to the max and ensure the histogram is correctly
+  // incremented.
+  for (int i = 0; i < 1996; ++i)
+    service->HandleUserInput(url1, SiteEngagementMetrics::ENGAGEMENT_MOUSE);
+  clock->SetNow(GetReferenceTime() + base::TimeDelta::FromMinutes(210));
+  service->HandleUserInput(url1, SiteEngagementMetrics::ENGAGEMENT_MOUSE);
+
+  histograms.ExpectTotalCount(
+      SiteEngagementMetrics::kOriginsWithMaxDailyEngagementHistogram, 4);
+  histograms.ExpectBucketCount(
+      SiteEngagementMetrics::kOriginsWithMaxDailyEngagementHistogram, 0, 3);
+  histograms.ExpectBucketCount(
+      SiteEngagementMetrics::kOriginsWithMaxDailyEngagementHistogram, 1, 1);
+  histograms.ExpectTotalCount(
+      SiteEngagementMetrics::kOriginsWithMaxEngagementHistogram, 4);
+  histograms.ExpectBucketCount(
+      SiteEngagementMetrics::kOriginsWithMaxEngagementHistogram, 0, 4);
 }
 
 // Expect that sites that have reached zero engagement are cleaned up.
 TEST_F(SiteEngagementServiceTest, CleanupEngagementScores) {
   base::SimpleTestClock* clock = new base::SimpleTestClock();
   scoped_ptr<SiteEngagementService> service(
       new SiteEngagementService(profile(), make_scoped_ptr(clock)));
 
   base::Time current_day = GetReferenceTime();
   clock->SetNow(current_day);
@@ skipping 49 matching lines @@
     EXPECT_EQ(1u, score_map.size());
     EXPECT_EQ(0, score_map[url1]);
 
     service->CleanupEngagementScores();
 
     score_map = service->GetScoreMap();
     EXPECT_EQ(0u, score_map.size());
     EXPECT_EQ(0, service->GetScore(url1));
   }
 }