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 323 matching lines @@
   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::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->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, 0);
+  histograms.ExpectTotalCount(
+      SiteEngagementMetrics::kOriginsWithMaxEngagementHistogram, 0);
 
   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, 0);
+  histograms.ExpectTotalCount(
+      SiteEngagementMetrics::kOriginsWithMaxEngagementHistogram, 0);
 
   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, 0);
+  histograms.ExpectTotalCount(
+      SiteEngagementMetrics::kOriginsWithMaxEngagementHistogram, 0);
 
   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, 0);
+  histograms.ExpectTotalCount(
+      SiteEngagementMetrics::kOriginsWithMaxEngagementHistogram, 0);
 }
 
 TEST_F(SiteEngagementServiceTest, GetTotalUserInputPoints) {
   SiteEngagementService* service =
       SiteEngagementServiceFactory::GetForProfile(profile());
   DCHECK(service);
 
+  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, 0);
+  histograms.ExpectTotalCount(
+      SiteEngagementMetrics::kOriginsWithMaxEngagementHistogram, 0);
 
-  service->HandleUserInput(url2);
-  service->HandleUserInput(url2);
+  service->HandleUserInput(url2, SiteEngagementMetrics::ENGAGEMENT_MOUSE);
+  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, 0);
+  histograms.ExpectTotalCount(
+      SiteEngagementMetrics::kOriginsWithMaxEngagementHistogram, 0);
 
-  service->HandleUserInput(url3);
+  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, 0);
+  histograms.ExpectTotalCount(
+      SiteEngagementMetrics::kOriginsWithMaxEngagementHistogram, 0);
 
-  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);
+  histograms.ExpectTotalCount(
+      SiteEngagementMetrics::kOriginsWithMaxDailyEngagementHistogram, 0);
+  histograms.ExpectTotalCount(
+      SiteEngagementMetrics::kOriginsWithMaxEngagementHistogram, 0);
 }