Add UMA metrics to the site engagement service.

chrome/browser/engagement/site_engagement_service_browsertest.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/run_loop.h"
 #include "base/single_thread_task_runner.h"
 #include "base/task_runner.h"
+#include "base/test/histogram_tester.h"
 #include "base/test/simple_test_clock.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/timer/mock_timer.h"
 #include "base/values.h"
 #include "chrome/browser/engagement/site_engagement_helper.h"
 #include "chrome/browser/engagement/site_engagement_service.h"
 #include "chrome/browser/engagement/site_engagement_service_factory.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/browser_with_test_window_test.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/test/browser_test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 
 class TestSiteEngagementHelper : public SiteEngagementHelper {
  public:
   explicit TestSiteEngagementHelper(content::WebContents* web_contents,
                                     bool enable_callbacks)
       : SiteEngagementHelper(web_contents),
         enable_callbacks_(enable_callbacks) { }
 
   ~TestSiteEngagementHelper() override { }
 
-  void RecordUserInput() override {
-    SiteEngagementHelper::RecordUserInput();
+  void RecordUserInput(SiteEngagementMetrics::EngagementType type) override {
+    SiteEngagementHelper::RecordUserInput(type);
     base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, quit_closure_);
   }
 
   // Must be called before initiating user input.
   void SetQuitClosure(base::Closure quit_closure) {
     quit_closure_ = quit_closure;
   }
 
   // Override to allow callback registration to be manually controlled in tests.
   bool ShouldRecordEngagement() override {
@@ skipping 155 matching lines @@
   GURL url1("https://www.google.com/");
   GURL url2("http://www.google.com/");
   content::WebContents* web_contents =
     browser()->tab_strip_model()->GetActiveWebContents();
 
   scoped_ptr<SiteEngagementHelper> helper(CreateHelper(web_contents));
   SiteEngagementService* service =
     SiteEngagementServiceFactory::GetForProfile(browser()->profile());
   DCHECK(service);
 
+  base::HistogramTester histograms;
+
+  // Histograms should start off empty.
+  histograms.ExpectTotalCount(SiteEngagementMetrics::kEngagementTypeHistogram,
+                              0);
+
   ui_test_utils::NavigateToURL(browser(), url1);
   EXPECT_DOUBLE_EQ(0.5, service->GetScore(url1));
   EXPECT_EQ(0, service->GetScore(url2));
+  histograms.ExpectTotalCount(SiteEngagementMetrics::kEngagementTypeHistogram,
+                              1);
+  histograms.ExpectBucketCount(SiteEngagementMetrics::kEngagementTypeHistogram,
+                               SiteEngagementMetrics::ENGAGEMENT_NAVIGATION, 1);
 
   HandleKeyPress(helper.get(), ui::VKEY_UP);
   HandleKeyPress(helper.get(), ui::VKEY_RETURN);
   HandleKeyPress(helper.get(), ui::VKEY_J);
 
   HandleMouseEvent(helper.get(), blink::WebMouseEvent::ButtonLeft,
                    blink::WebInputEvent::MouseDown);
 
   EXPECT_DOUBLE_EQ(0.7, service->GetScore(url1));
   EXPECT_EQ(0, service->GetScore(url2));
+  histograms.ExpectTotalCount(SiteEngagementMetrics::kEngagementTypeHistogram,
+                              5);
+  histograms.ExpectBucketCount(SiteEngagementMetrics::kEngagementTypeHistogram,
+                               SiteEngagementMetrics::ENGAGEMENT_NAVIGATION, 1);
+  histograms.ExpectBucketCount(SiteEngagementMetrics::kEngagementTypeHistogram,
+                               SiteEngagementMetrics::ENGAGEMENT_KEYPRESS, 3);
+  histograms.ExpectBucketCount(SiteEngagementMetrics::kEngagementTypeHistogram,
+                               SiteEngagementMetrics::ENGAGEMENT_MOUSE, 1);
 
   HandleMouseEvent(helper.get(), blink::WebMouseEvent::ButtonRight,
                    blink::WebInputEvent::MouseDown);
   HandleMouseEvent(helper.get(), blink::WebMouseEvent::ButtonMiddle,
                    blink::WebInputEvent::MouseDown);
   HandleMouseEvent(helper.get(), blink::WebMouseEvent::ButtonNone,
                    blink::WebInputEvent::MouseWheel);
 
   EXPECT_DOUBLE_EQ(0.85, service->GetScore(url1));
   EXPECT_EQ(0, service->GetScore(url2));
+  histograms.ExpectTotalCount(SiteEngagementMetrics::kEngagementTypeHistogram,
+                              8);
+  histograms.ExpectBucketCount(SiteEngagementMetrics::kEngagementTypeHistogram,
+                               SiteEngagementMetrics::ENGAGEMENT_MOUSE, 4);
 
   ui_test_utils::NavigateToURL(browser(), url2);
 
   EXPECT_DOUBLE_EQ(0.85, service->GetScore(url1));
   EXPECT_DOUBLE_EQ(0.5, service->GetScore(url2));
   EXPECT_DOUBLE_EQ(1.35, service->GetTotalEngagementPoints());
 
   HandleMouseEvent(helper.get(), blink::WebMouseEvent::ButtonNone,
                    blink::WebInputEvent::MouseWheel);
   HandleKeyPress(helper.get(), ui::VKEY_DOWN);
 
   EXPECT_DOUBLE_EQ(0.85, service->GetScore(url1));
   EXPECT_DOUBLE_EQ(0.6, service->GetScore(url2));
   EXPECT_DOUBLE_EQ(1.45, service->GetTotalEngagementPoints());
+  histograms.ExpectTotalCount(SiteEngagementMetrics::kEngagementTypeHistogram,
+                              11);
+  histograms.ExpectBucketCount(SiteEngagementMetrics::kEngagementTypeHistogram,
+                               SiteEngagementMetrics::ENGAGEMENT_NAVIGATION, 2);
+  histograms.ExpectBucketCount(SiteEngagementMetrics::kEngagementTypeHistogram,
+                               SiteEngagementMetrics::ENGAGEMENT_KEYPRESS, 4);
+  histograms.ExpectBucketCount(SiteEngagementMetrics::kEngagementTypeHistogram,
+                               SiteEngagementMetrics::ENGAGEMENT_MOUSE, 5);
 }
 
 IN_PROC_BROWSER_TEST_F(SiteEngagementServiceBrowserTest,
                        CheckTimer) {
   GURL url1("https://www.google.com/");
   GURL url2("http://www.google.com/");
   content::WebContents* web_contents =
     browser()->tab_strip_model()->GetActiveWebContents();
 
   scoped_ptr<base::MockTimer> mock_timer(new base::MockTimer(true, false));
@@ skipping 218 matching lines @@
 
     // Timer runs after input is recorded, and after it fires the callbacks are
     // added.
     EXPECT_FALSE(CallbacksAdded(helper.get()));
     EXPECT_TRUE(timer->IsRunning());
     timer->Fire();
     EXPECT_FALSE(timer->IsRunning());
     EXPECT_TRUE(CallbacksAdded(helper.get()));
   }
 }