Refactored get histogram name to arc utils.

Bug: b:139752841
Change-Id: Ibaeed64fa47adde6e6b374e2771bd697a9715bcf
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1793252Reviewed-by: Shao-Chuan Lee <shaochuan@chromium.org>
Reviewed-by: Hidehiko Abe <hidehiko@chromium.org>
Commit-Queue: Shao-Chuan Lee <shaochuan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#699179}

chrome/browser/chromeos/arc/arc_optin_uma.cc

@@ -21,25 +21,6 @@ namespace arc {
 
 namespace {
 
-// Adds a suffix to the name based on the account type.
-std::string GetHistogramName(const std::string& base_name,
-                             const Profile* profile) {
-  if (IsRobotOrOfflineDemoAccountMode()) {
-    chromeos::DemoSession* demo_session = chromeos::DemoSession::Get();
-    if (demo_session && demo_session->started()) {
-      return demo_session->offline_enrolled() ? base_name + "OfflineDemoMode"
-                                              : base_name + "DemoMode";
-    }
-    return base_name + "RobotAccount";
-  }
-  if (profile->IsChild())
-    return base_name + "Child";
-  if (IsActiveDirectoryUserForProfile(profile))
-    return base_name + "ActiveDirectory";
-  return base_name +
-         (policy_util::IsAccountManaged(profile) ? "Managed" : "Unmanaged");
-}
-
 ArcEnabledState ComputeEnabledState(bool enabled, const Profile* profile) {
   if (!IsArcAllowedForProfile(profile)) {
     return enabled ? ArcEnabledState::ENABLED_NOT_ALLOWED
@@ -75,7 +56,7 @@ void UpdateEnabledStateByUserTypeUMA() {
     enabled_state = stability_metrics_manager->GetArcEnabledState();
 
   base::UmaHistogramEnumeration(
-      GetHistogramName("Arc.StateByUserType.", profile),
+      GetHistogramNameByUserType("Arc.StateByUserType", profile),
       ComputeEnabledState(enabled_state.value_or(false), profile));
 }
 
@@ -95,7 +76,7 @@ void UpdateProvisioningResultUMA(ProvisioningResult result,
                                  const Profile* profile) {
   DCHECK_NE(result, ProvisioningResult::CHROME_SERVER_COMMUNICATION_ERROR);
   base::UmaHistogramEnumeration(
-      GetHistogramName("Arc.Provisioning.Result.", profile), result);
+      GetHistogramNameByUserType("Arc.Provisioning.Result", profile), result);
 }
 
 void UpdateSecondarySigninResultUMA(ProvisioningResult result) {
@@ -105,32 +86,35 @@ void UpdateSecondarySigninResultUMA(ProvisioningResult result) {
 void UpdateProvisioningTiming(const base::TimeDelta& elapsed_time,
                               bool success,
                               const Profile* profile) {
-  std::string histogram_name = "Arc.Provisioning.TimeDelta.";
-  histogram_name += success ? "Success." : "Failure.";
+  std::string histogram_name = "Arc.Provisioning.TimeDelta";
+  histogram_name += success ? ".Success" : ".Failure";
   // The macro UMA_HISTOGRAM_CUSTOM_TIMES expects a constant string, but since
   // this measurement happens very infrequently, we do not need to use a macro
   // here.
-  base::UmaHistogramCustomTimes(GetHistogramName(histogram_name, profile),
-                                elapsed_time, base::TimeDelta::FromSeconds(1),
-                                base::TimeDelta::FromMinutes(6), 50);
+  base::UmaHistogramCustomTimes(
+      GetHistogramNameByUserType(histogram_name, profile), elapsed_time,
+      base::TimeDelta::FromSeconds(1), base::TimeDelta::FromMinutes(6), 50);
 }
 
 void UpdateReauthorizationResultUMA(ProvisioningResult result,
                                     const Profile* profile) {
   base::UmaHistogramEnumeration(
-      GetHistogramName("Arc.Reauthorization.Result.", profile), result);
+      GetHistogramNameByUserType("Arc.Reauthorization.Result", profile),
+      result);
 }
 
 void UpdatePlayAutoInstallRequestState(mojom::PaiFlowState state,
                                        const Profile* profile) {
   base::UmaHistogramEnumeration(
-      GetHistogramName("Arc.PlayAutoInstallRequest.State.", profile), state);
+      GetHistogramNameByUserType("Arc.PlayAutoInstallRequest.State", profile),
+      state);
 }
 
 void UpdatePlayAutoInstallRequestTime(const base::TimeDelta& elapsed_time,
                                       const Profile* profile) {
   base::UmaHistogramCustomTimes(
-      GetHistogramName("Arc.PlayAutoInstallRequest.TimeDelta.", profile),
+      GetHistogramNameByUserType("Arc.PlayAutoInstallRequest.TimeDelta",
+                                 profile),
       elapsed_time, base::TimeDelta::FromSeconds(1),
       base::TimeDelta::FromMinutes(10), 50);
 }
@@ -138,8 +122,9 @@ void UpdatePlayAutoInstallRequestTime(const base::TimeDelta& elapsed_time,
 void UpdatePlayStoreShowTime(const base::TimeDelta& elapsed_time,
                              const Profile* profile) {
   base::UmaHistogramCustomTimes(
-      GetHistogramName("Arc.PlayStoreShown.TimeDelta.", profile), elapsed_time,
-      base::TimeDelta::FromSeconds(1), base::TimeDelta::FromMinutes(10), 50);
+      GetHistogramNameByUserType("Arc.PlayStoreShown.TimeDelta", profile),
+      elapsed_time, base::TimeDelta::FromSeconds(1),
+      base::TimeDelta::FromMinutes(10), 50);
 }
 
 void UpdateAuthTiming(const char* histogram_name,

chrome/browser/chromeos/arc/arc_util.cc

@@ -663,4 +663,25 @@ std::unique_ptr<content::WebContents> CreateArcCustomTabWebContents(
   return web_contents;
 }
 
+std::string GetHistogramNameByUserType(const std::string& base_name,
+                                       const Profile* profile) {
+  if (profile == nullptr) {
+    profile = ProfileManager::GetPrimaryUserProfile();
+  }
+  if (IsRobotOrOfflineDemoAccountMode()) {
+    chromeos::DemoSession* demo_session = chromeos::DemoSession::Get();
+    if (demo_session && demo_session->started()) {
+      return demo_session->offline_enrolled() ? base_name + ".OfflineDemoMode"
+                                              : base_name + ".DemoMode";
+    }
+    return base_name + ".RobotAccount";
+  }
+  if (profile->IsChild())
+    return base_name + ".Child";
+  if (IsActiveDirectoryUserForProfile(profile))
+    return base_name + ".ActiveDirectory";
+  return base_name +
+         (policy_util::IsAccountManaged(profile) ? ".Managed" : ".Unmanaged");
+}
+
 }  // namespace arc

chrome/browser/chromeos/arc/arc_util.h

@@ -194,6 +194,11 @@ std::unique_ptr<content::WebContents> CreateArcCustomTabWebContents(
     Profile* profile,
     const GURL& url);
 
+// Adds a suffix to the name based on the account type. If profile is not
+// provided, then defaults to the primary user profile.
+std::string GetHistogramNameByUserType(const std::string& base_name,
+                                       const Profile* profile = nullptr);
+
 }  // namespace arc
 
 #endif  // CHROME_BROWSER_CHROMEOS_ARC_ARC_UTIL_H_