cros: Change UMA metric naming of policy change count

Fix the difference strings of poliy change count in UMA
histogram and in app time controller.

Bug: 1074447
Change-Id: If598c44e2515aef9d85e4bf45ee0d327b94de24a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2222558Reviewed-by: Yilkal Abe <yilkal@chromium.org>
Reviewed-by: Aga Wronska <agawronska@chromium.org>
Commit-Queue: Xiqi Ruan <xiqiruan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#773551}

chrome/browser/chromeos/child_accounts/time_limits/app_time_controller.cc

@@ -55,8 +55,8 @@ const char kAppsWithTimeLimitMetric[] =
     "SupervisedUsers.PerAppTimeLimits.AppsWithTimeLimit";
 const char kBlockedAppsCountMetric[] =
     "SupervisedUsers.PerAppTimeLimits.BlockedAppsCount";
-const char kPolicyUpdateCountMetric[] =
-    "SupervisedUsers.PerAppTimeLimits.PolicyUpdateCount";
+const char kPolicyChangeCountMetric[] =
+    "SupervisedUsers.PerAppTimeLimits.PolicyChangeCount";
 const char kEngagementMetric[] = "SupervisedUsers.PerAppTimeLimits.Engagement";
 
 namespace {
@@ -301,7 +301,7 @@ base::Optional<base::TimeDelta> AppTimeController::GetTimeLimitForApp(
 }
 
 void AppTimeController::RecordMetricsOnShutdown() const {
-  base::UmaHistogramCounts1000(kPolicyUpdateCountMetric,
+  base::UmaHistogramCounts1000(kPolicyChangeCountMetric,
                                patl_policy_update_count_);
 }
 

chrome/browser/chromeos/child_accounts/time_limits/app_time_controller.h

@@ -31,14 +31,14 @@ class OneShotTimer;
 
 namespace gfx {
 class ImageSkia;
-} // namespace gfx
+}  // namespace gfx
 
 namespace chromeos {
 namespace app_time {
 
 extern const char kAppsWithTimeLimitMetric[];
 extern const char kBlockedAppsCountMetric[];
-extern const char kPolicyUpdateCountMetric[];
+extern const char kPolicyChangeCountMetric[];
 extern const char kEngagementMetric[];
 
 class AppServiceWrapper;

chrome/browser/chromeos/child_accounts/time_limits/app_time_controller_unittest.cc

@@ -571,7 +571,7 @@ TEST_F(AppTimeControllerTest, MetricsTest) {
   controller()->app_registry()->SaveAppActivity();
   controller()->RecordMetricsOnShutdown();
   DeleteController();
-  histogram_tester.ExpectBucketCount(kPolicyUpdateCountMetric, 1, 1);
+  histogram_tester.ExpectBucketCount(kPolicyChangeCountMetric, 1, 1);
 
   InstantiateController();
 
@@ -583,12 +583,12 @@ TEST_F(AppTimeControllerTest, MetricsTest) {
   // metrics.
   histogram_tester.ExpectBucketCount(kBlockedAppsCountMetric, 1, 1);
   histogram_tester.ExpectBucketCount(kAppsWithTimeLimitMetric, 1, 1);
-  histogram_tester.ExpectBucketCount(kPolicyUpdateCountMetric, 1, 1);
+  histogram_tester.ExpectBucketCount(kPolicyChangeCountMetric, 1, 1);
 
   controller()->RecordMetricsOnShutdown();
   DeleteController();
   // There was actually no policy update when the controller was reinstantiated.
-  histogram_tester.ExpectBucketCount(kPolicyUpdateCountMetric, 0, 1);
+  histogram_tester.ExpectBucketCount(kPolicyChangeCountMetric, 0, 1);
 }
 
 TEST_F(AppTimeControllerTest, SetLastResetTimeTest) {