Add UMA metrics to phishguard pings

chrome/browser/safe_browsing/chrome_password_protection_service_unittest.cc

 // Copyright 2017 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 "chrome/browser/safe_browsing/chrome_password_protection_service.h"
 
+#include "base/test/histogram_tester.h"
 #include "base/test/scoped_feature_list.h"
 #include "components/variations/variations_params_manager.h"
 #include "content/public/test/test_browser_thread_bundle.h"
+#include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace safe_browsing {
 
 class MockChromePasswordProtectionService
     : public ChromePasswordProtectionService {
  public:
   MockChromePasswordProtectionService()
       : ChromePasswordProtectionService(),
         is_incognito_(false),
@@ skipping 43 matching lines @@
             {"all_population", allowed_for_all ? "true" : "false"},
             {"extended_reporting",
              allowed_for_extended_reporting ? "true" : "false"},
             {"history_sync", allowed_for_history_sync ? "true" : "false"}};
   }
 
  protected:
   content::TestBrowserThreadBundle thread_bundle_;
   variations::testing::VariationParamsManager params_manager_;
   base::test::ScopedFeatureList scoped_feature_list_;
+  base::HistogramTester histograms_;
 };
 
 TEST_F(ChromePasswordProtectionServiceTest,
        VerifyFinchControlForLowReputationPingSBEROnlyNoIncognito) {
   MockChromePasswordProtectionService service;
+  histograms_.ExpectTotalCount(kPasswordOnFocusRequestOutcomeHistogramName, 0);
   // By default kPasswordFieldOnFocusPinging feature is disabled.
   EXPECT_FALSE(service.IsPingingEnabled(kPasswordFieldOnFocusPinging));
+  EXPECT_THAT(
+      histograms_.GetAllSamples(kPasswordOnFocusRequestOutcomeHistogramName),
+      testing::ElementsAre(base::Bucket(12, 1)));
 
   // Enables kPasswordFieldOnFocusPinging feature.
   scoped_feature_list_.InitAndEnableFeature(kPasswordFieldOnFocusPinging);
   // Creates finch trial parameters correspond to the following experiment:
   // "name": "SBEROnlyNoIncognito",
   // "params": {
   //     "incognito": "false",
   //     "extended_reporting": "true",
   //     "history_sync": "false"
   // },
   // "enable_features": [
   //     "PasswordFieldOnFocusPinging"
   // ]
   Parameters sber_and_no_incognito =
       CreateParameters(false, false, true, false);
   SetFeatureParams(kPasswordFieldOnFocusPinging, "SBEROnlyNoIncognito",
                    sber_and_no_incognito);
+
   service.ConfigService(false /*incognito*/, false /*SBER*/, false /*sync*/);
   EXPECT_FALSE(service.IsPingingEnabled(kPasswordFieldOnFocusPinging));
+  EXPECT_THAT(
+      histograms_.GetAllSamples(kPasswordOnFocusRequestOutcomeHistogramName),

[Nathan Parker, 2017/05/11 23:36:31]

How about a comment that says where the bucket values come from?  Like, then
enum.  That'd make it easier for readers to understand the numbers, and extend
this when more are added.

[Nathan Parker, 2017/05/11 23:36:31]

nit: Add up top
 
using testing:ElementsAre
using base::Bucket

[Jialiu Lin, 2017/05/12 02:12:32]

Due to the code refactoring, no need to check histogram anymore.

+      testing::ElementsAre(base::Bucket(12, 1), base::Bucket(13, 1)));
+
   service.ConfigService(false /*incognito*/, false /*SBER*/, true /*sync*/);
   EXPECT_FALSE(service.IsPingingEnabled(kPasswordFieldOnFocusPinging));
+  EXPECT_THAT(
+      histograms_.GetAllSamples(kPasswordOnFocusRequestOutcomeHistogramName),
+      testing::ElementsAre(base::Bucket(12, 1), base::Bucket(13, 2)));
+
   service.ConfigService(false /*incognito*/, true /*SBER*/, false /*sync*/);
   EXPECT_TRUE(service.IsPingingEnabled(kPasswordFieldOnFocusPinging));
+  EXPECT_THAT(
+      histograms_.GetAllSamples(kPasswordOnFocusRequestOutcomeHistogramName),
+      testing::ElementsAre(base::Bucket(12, 1), base::Bucket(13, 2)));
+
   service.ConfigService(false /*incognito*/, true /*SBER*/, true /*sync*/);
   EXPECT_TRUE(service.IsPingingEnabled(kPasswordFieldOnFocusPinging));
+  EXPECT_THAT(
+      histograms_.GetAllSamples(kPasswordOnFocusRequestOutcomeHistogramName),
+      testing::ElementsAre(base::Bucket(12, 1), base::Bucket(13, 2)));
+
   service.ConfigService(true /*incognito*/, false /*SBER*/, false /*sync*/);
   EXPECT_FALSE(service.IsPingingEnabled(kPasswordFieldOnFocusPinging));
+  EXPECT_THAT(
+      histograms_.GetAllSamples(kPasswordOnFocusRequestOutcomeHistogramName),
+      testing::ElementsAre(base::Bucket(7, 1), base::Bucket(12, 1),
+                           base::Bucket(13, 2)));
+
   service.ConfigService(true /*incognito*/, false /*SBER*/, true /*sync*/);
   EXPECT_FALSE(service.IsPingingEnabled(kPasswordFieldOnFocusPinging));
+  EXPECT_THAT(
+      histograms_.GetAllSamples(kPasswordOnFocusRequestOutcomeHistogramName),
+      testing::ElementsAre(base::Bucket(7, 2), base::Bucket(12, 1),
+                           base::Bucket(13, 2)));
+
   service.ConfigService(true /*incognito*/, true /*SBER*/, false /*sync*/);
   EXPECT_FALSE(service.IsPingingEnabled(kPasswordFieldOnFocusPinging));
+  EXPECT_THAT(
+      histograms_.GetAllSamples(kPasswordOnFocusRequestOutcomeHistogramName),
+      testing::ElementsAre(base::Bucket(7, 3), base::Bucket(12, 1),
+                           base::Bucket(13, 2)));
+
   service.ConfigService(true /*incognito*/, true /*SBER*/, true /*sync*/);
   EXPECT_FALSE(service.IsPingingEnabled(kPasswordFieldOnFocusPinging));
+  EXPECT_THAT(
+      histograms_.GetAllSamples(kPasswordOnFocusRequestOutcomeHistogramName),
+      testing::ElementsAre(base::Bucket(7, 4), base::Bucket(12, 1),
+                           base::Bucket(13, 2)));
 }
 
 TEST_F(ChromePasswordProtectionServiceTest,
        VerifyFinchControlForLowReputationPingSBERAndHistorySyncNoIncognito) {
   MockChromePasswordProtectionService service;
-  // By default kPasswordFieldOnFocusPinging feature is disabled.
-  EXPECT_FALSE(service.IsPingingEnabled(kPasswordFieldOnFocusPinging));
+  histograms_.ExpectTotalCount(kPasswordOnFocusRequestOutcomeHistogramName, 0);
 
   // Enables kPasswordFieldOnFocusPinging feature.
   scoped_feature_list_.InitAndEnableFeature(kPasswordFieldOnFocusPinging);
   // Creates finch trial parameters correspond to the following experiment:
   // "name": "SBERAndHistorySyncNoIncognito",
   // "params": {
   //     "incognito": "false",
   //     "extended_reporting": "true",
   //     "history_sync": "true"
   // },
   // "enable_features": [
   //     "PasswordFieldOnFocusPinging"
   // ]
   Parameters sber_and_sync_no_incognito =
       CreateParameters(false, false, true, true);
   SetFeatureParams(kPasswordFieldOnFocusPinging,
                    "SBERAndHistorySyncNoIncognito", sber_and_sync_no_incognito);
   service.ConfigService(false /*incognito*/, false /*SBER*/, false /*sync*/);
   EXPECT_FALSE(service.IsPingingEnabled(kPasswordFieldOnFocusPinging));
+  EXPECT_THAT(
+      histograms_.GetAllSamples(kPasswordOnFocusRequestOutcomeHistogramName),
+      testing::ElementsAre(base::Bucket(13, 1)));
+
   service.ConfigService(false /*incognito*/, false /*SBER*/, true /*sync*/);
   EXPECT_TRUE(service.IsPingingEnabled(kPasswordFieldOnFocusPinging));
+  EXPECT_THAT(
+      histograms_.GetAllSamples(kPasswordOnFocusRequestOutcomeHistogramName),
+      testing::ElementsAre(base::Bucket(13, 1)));
+
   service.ConfigService(false /*incognito*/, true /*SBER*/, false /*sync*/);
   EXPECT_TRUE(service.IsPingingEnabled(kPasswordFieldOnFocusPinging));
+  EXPECT_THAT(
+      histograms_.GetAllSamples(kPasswordOnFocusRequestOutcomeHistogramName),
+      testing::ElementsAre(base::Bucket(13, 1)));
+
   service.ConfigService(false /*incognito*/, true /*SBER*/, true /*sync*/);
   EXPECT_TRUE(service.IsPingingEnabled(kPasswordFieldOnFocusPinging));
+  EXPECT_THAT(
+      histograms_.GetAllSamples(kPasswordOnFocusRequestOutcomeHistogramName),
+      testing::ElementsAre(base::Bucket(13, 1)));
+
   service.ConfigService(true /*incognito*/, false /*SBER*/, false /*sync*/);
   EXPECT_FALSE(service.IsPingingEnabled(kPasswordFieldOnFocusPinging));
+  EXPECT_THAT(
+      histograms_.GetAllSamples(kPasswordOnFocusRequestOutcomeHistogramName),
+      testing::ElementsAre(base::Bucket(7, 1), base::Bucket(13, 1)));
+
   service.ConfigService(true /*incognito*/, false /*SBER*/, true /*sync*/);
   EXPECT_FALSE(service.IsPingingEnabled(kPasswordFieldOnFocusPinging));
+  EXPECT_THAT(
+      histograms_.GetAllSamples(kPasswordOnFocusRequestOutcomeHistogramName),
+      testing::ElementsAre(base::Bucket(7, 2), base::Bucket(13, 1)));
+
   service.ConfigService(true /*incognito*/, true /*SBER*/, false /*sync*/);
   EXPECT_FALSE(service.IsPingingEnabled(kPasswordFieldOnFocusPinging));
+  EXPECT_THAT(
+      histograms_.GetAllSamples(kPasswordOnFocusRequestOutcomeHistogramName),
+      testing::ElementsAre(base::Bucket(7, 3), base::Bucket(13, 1)));
+
   service.ConfigService(true /*incognito*/, true /*SBER*/, true /*sync*/);
   EXPECT_FALSE(service.IsPingingEnabled(kPasswordFieldOnFocusPinging));
+  EXPECT_THAT(
+      histograms_.GetAllSamples(kPasswordOnFocusRequestOutcomeHistogramName),
+      testing::ElementsAre(base::Bucket(7, 4), base::Bucket(13, 1)));
 }
 
 TEST_F(ChromePasswordProtectionServiceTest,
        VerifyFinchControlForLowReputationPingAllButNoIncognito) {
   MockChromePasswordProtectionService service;
-  // By default kPasswordFieldOnFocusPinging feature is disabled.
-  EXPECT_FALSE(service.IsPingingEnabled(kPasswordFieldOnFocusPinging));
+  histograms_.ExpectTotalCount(kPasswordOnFocusRequestOutcomeHistogramName, 0);
 
   // Enables kPasswordFieldOnFocusPinging feature.
   scoped_feature_list_.InitAndEnableFeature(kPasswordFieldOnFocusPinging);
   // Creates finch trial parameters correspond to the following experiment:
   // "name": "AllButNoIncognito",
   // "params": {
   //     "all_population": "true",
   //     "incongito": "false"
   // },
   // "enable_features": [
   //     "PasswordFieldOnFocusPinging"
   // ]
   Parameters all_users = CreateParameters(false, true, true, true);
   SetFeatureParams(kPasswordFieldOnFocusPinging, "AllButNoIncognito",
                    all_users);
   service.ConfigService(false /*incognito*/, false /*SBER*/, false /*sync*/);
   EXPECT_TRUE(service.IsPingingEnabled(kPasswordFieldOnFocusPinging));
+  histograms_.ExpectTotalCount(kPasswordOnFocusRequestOutcomeHistogramName, 0);
+
   service.ConfigService(false /*incognito*/, false /*SBER*/, true /*sync*/);
   EXPECT_TRUE(service.IsPingingEnabled(kPasswordFieldOnFocusPinging));
+  histograms_.ExpectTotalCount(kPasswordOnFocusRequestOutcomeHistogramName, 0);
+
   service.ConfigService(false /*incognito*/, true /*SBER*/, false /*sync*/);
   EXPECT_TRUE(service.IsPingingEnabled(kPasswordFieldOnFocusPinging));
+  histograms_.ExpectTotalCount(kPasswordOnFocusRequestOutcomeHistogramName, 0);
+
   service.ConfigService(false /*incognito*/, true /*SBER*/, true /*sync*/);
   EXPECT_TRUE(service.IsPingingEnabled(kPasswordFieldOnFocusPinging));
+  histograms_.ExpectTotalCount(kPasswordOnFocusRequestOutcomeHistogramName, 0);
+
   service.ConfigService(true /*incognito*/, false /*SBER*/, false /*sync*/);
   EXPECT_FALSE(service.IsPingingEnabled(kPasswordFieldOnFocusPinging));
+  EXPECT_THAT(
+      histograms_.GetAllSamples(kPasswordOnFocusRequestOutcomeHistogramName),
+      testing::ElementsAre(base::Bucket(7, 1)));
+
   service.ConfigService(true /*incognito*/, false /*SBER*/, true /*sync*/);
   EXPECT_FALSE(service.IsPingingEnabled(kPasswordFieldOnFocusPinging));
+  EXPECT_THAT(
+      histograms_.GetAllSamples(kPasswordOnFocusRequestOutcomeHistogramName),
+      testing::ElementsAre(base::Bucket(7, 2)));
+
   service.ConfigService(true /*incognito*/, true /*SBER*/, false /*sync*/);
   EXPECT_FALSE(service.IsPingingEnabled(kPasswordFieldOnFocusPinging));
+  EXPECT_THAT(
+      histograms_.GetAllSamples(kPasswordOnFocusRequestOutcomeHistogramName),
+      testing::ElementsAre(base::Bucket(7, 3)));
+
   service.ConfigService(true /*incognito*/, true /*SBER*/, true /*sync*/);
   EXPECT_FALSE(service.IsPingingEnabled(kPasswordFieldOnFocusPinging));
+  EXPECT_THAT(
+      histograms_.GetAllSamples(kPasswordOnFocusRequestOutcomeHistogramName),
+      testing::ElementsAre(base::Bucket(7, 4)));
 }
 
 TEST_F(ChromePasswordProtectionServiceTest,
        VerifyFinchControlForLowReputationPingAll) {
   MockChromePasswordProtectionService service;
-  // By default kPasswordFieldOnFocusPinging feature is disabled.
-  EXPECT_FALSE(service.IsPingingEnabled(kPasswordFieldOnFocusPinging));
+  histograms_.ExpectTotalCount(kPasswordOnFocusRequestOutcomeHistogramName, 0);
 
   // Enables kPasswordFieldOnFocusPinging feature.
   scoped_feature_list_.InitAndEnableFeature(kPasswordFieldOnFocusPinging);
   // Creates finch trial parameters correspond to the following experiment:
   // "name": "All",
   // "params": {
   //     "all_population": "true",
   //     "incognito": "true"
   // },
   // "enable_features": [
@@ skipping 10 matching lines @@
   service.ConfigService(false /*incognito*/, true /*SBER*/, true /*sync*/);
   EXPECT_TRUE(service.IsPingingEnabled(kPasswordFieldOnFocusPinging));
   service.ConfigService(true /*incognito*/, false /*SBER*/, false /*sync*/);
   EXPECT_TRUE(service.IsPingingEnabled(kPasswordFieldOnFocusPinging));
   service.ConfigService(true /*incognito*/, false /*SBER*/, true /*sync*/);
   EXPECT_TRUE(service.IsPingingEnabled(kPasswordFieldOnFocusPinging));
   service.ConfigService(true /*incognito*/, true /*SBER*/, false /*sync*/);
   EXPECT_TRUE(service.IsPingingEnabled(kPasswordFieldOnFocusPinging));
   service.ConfigService(true /*incognito*/, true /*SBER*/, true /*sync*/);
   EXPECT_TRUE(service.IsPingingEnabled(kPasswordFieldOnFocusPinging));
+  histograms_.ExpectTotalCount(kPasswordOnFocusRequestOutcomeHistogramName, 0);
 }
 
 }  // namespace safe_browsing