Profile_Metrics integration with Keystone

chrome/browser/profiles/profile_metrics.cc

 // Copyright (c) 2011 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/profiles/profile_metrics.h"
 
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 20 matching lines @@
   // In unittests, we do not always have a profile_manager so check.
   if (manager) {
     user_data_dir = manager->user_data_dir();
   }
   if (profile_path == user_data_dir.AppendASCII(chrome::kInitialProfile)) {
     metric = ProfileMetrics::ORIGINAL;
   }
   return metric;
 }
 
-void UpdateReportedOSProfileStatistics(int active, int signedin) {
-#if defined(OS_WIN)
-  GoogleUpdateSettings::UpdateProfileCounts(active, signedin);
-#endif
-}
-
 void LogLockedProfileInformation(ProfileManager* manager) {
   const ProfileInfoCache& info_cache = manager->GetProfileInfoCache();
   size_t number_of_profiles = info_cache.GetNumberOfProfiles();
 
   base::Time now = base::Time::Now();
   const int kMinutesInProfileValidDuration =
       base::TimeDelta::FromDays(28).InMinutes();
   for (size_t i = 0; i < number_of_profiles; ++i) {
     // Find when locked profiles were locked
     if (info_cache.ProfileIsSigninRequiredAtIndex(i)) {
@@ skipping 85 matching lines @@
       }
     }
   }
   return true;
 }
 
 
 void ProfileMetrics::UpdateReportedProfilesStatistics(ProfileManager* manager) {
   ProfileCounts counts;
   if (CountProfileInformation(manager, &counts)) {
     int limited_total = counts.total;

[Mark Mentovai, 2014/10/09 21:26:21]

Other option: change these to size_t. All of the fields in ProfileCounts are
already size_t. You will need to change the definition of
UpdateReportedOSProfileStatistics to take two size_t arguments. You will need to
update the Mac and Windows code to deal with size_t. You will need to check in
keystone_glue.mm that you’re not overflowing uint32_t where the conversion is
made. You may also need to check this in the Windows file.

The existing use of “int” here does seem sloppy.

[Mike Lerman, 2014/10/10 15:32:29]

Ok. I changed the profile_metrics code to work with size_t, which is internally
consistent. Windows code updated, which was simpler, as all I end up doing is
converting to a string, so I used a different converstion function.

I added a check in profile_metrics_mac.mm that calls
IsValueInRangeForNumericType before casting to a uint32_t and calling
keystone_glue (it seemed clean to do the conversion in there and leave the
interface to keystone_glue.mm with a uint32_t type).

     int limited_signedin = counts.signedin;
     if (limited_total > kMaximumReportedProfileCount) {
       limited_total = kMaximumReportedProfileCount + 1;
       limited_signedin =
           (int)((float)(counts.signedin * limited_total)
           / counts.total + 0.5);
     }
+#if defined(OS_WIN) || defined(OS_MACOSX)
     UpdateReportedOSProfileStatistics(limited_total, limited_signedin);
+#endif
   }
 }
 
+// The MACOSX implementation of this function is in profile_metrics_mac.mm.
+#if defined(OS_WIN)
+void ProfileMetrics::UpdateReportedOSProfileStatistics(
+    int active, int signedin) {
+  GoogleUpdateSettings::UpdateProfileCounts(active, signedin);
+}
+#endif
+
 void ProfileMetrics::LogNumberOfProfiles(ProfileManager* manager) {
   ProfileCounts counts;
   bool success = CountProfileInformation(manager, &counts);
   UMA_HISTOGRAM_COUNTS_100("Profile.NumberOfProfiles", counts.total);
 
   // Ignore other metrics if we have no profiles, e.g. in Chrome Frame tests.
   if (success) {
     UMA_HISTOGRAM_COUNTS_100("Profile.NumberOfManagedProfiles",
                              counts.supervised);
     UMA_HISTOGRAM_COUNTS_100("Profile.PercentageOfManagedProfiles",
                              100 * counts.supervised / counts.total);
     UMA_HISTOGRAM_COUNTS_100("Profile.NumberOfSignedInProfiles",
                              counts.signedin);
     UMA_HISTOGRAM_COUNTS_100("Profile.NumberOfUnusedProfiles",
                              counts.unused);
     UMA_HISTOGRAM_COUNTS_100("Profile.NumberOfSignedInProfilesWithGAIAIcons",
                              counts.gaia_icon);
 
     LogLockedProfileInformation(manager);
+
+#if defined(OS_WIN) || defined(OS_MACOSX)
     UpdateReportedOSProfileStatistics(counts.total, counts.signedin);
+#endif
   }
 }
 
 void ProfileMetrics::LogProfileAddNewUser(ProfileAdd metric) {
   DCHECK(metric < NUM_PROFILE_ADD_METRICS);
   UMA_HISTOGRAM_ENUMERATION("Profile.AddNewUser", metric,
                             NUM_PROFILE_ADD_METRICS);
   UMA_HISTOGRAM_ENUMERATION("Profile.NetUserCount", ADD_NEW_USER,
                             NUM_PROFILE_NET_METRICS);
 }
@@ skipping 266 matching lines @@
   UMA_HISTOGRAM_ENUMERATION("Profile.SyncSignIn",
                             GetProfileType(profile_path),
                             NUM_PROFILE_TYPE_METRICS);
 }
 
 void ProfileMetrics::LogProfileUpdate(const base::FilePath& profile_path) {
   UMA_HISTOGRAM_ENUMERATION("Profile.Update",
                             GetProfileType(profile_path),
                             NUM_PROFILE_TYPE_METRICS);
 }