Revert of 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"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_info_cache.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/signin/signin_header_helper.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/installer/util/google_update_settings.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/user_metrics.h"
 
 namespace {
 
-#if defined(OS_WIN) || defined(OS_MACOSX)
 const int kMaximumReportedProfileCount = 5;
-#endif
-
 const int kMaximumDaysOfDisuse = 4 * 7;  // Should be integral number of weeks.
 
 size_t number_of_profile_switches_ = 0;
 
 // Enum for tracking the state of profiles being switched to.
 enum ProfileOpenState {
   // Profile being switched to is already opened and has browsers opened.
   PROFILE_OPENED = 0,
   // Profile being switched to is already opened but has no browsers opened.
   PROFILE_OPENED_NO_BROWSER,
@@ skipping 26 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 84 matching lines @@
           counts->gaia_icon++;
         if (info_cache.ProfileIsAuthErrorAtIndex(i))
           counts->auth_errors++;
       }
     }
   }
   return true;
 }
 
 void ProfileMetrics::UpdateReportedProfilesStatistics(ProfileManager* manager) {
-#if defined(OS_WIN) || defined(OS_MACOSX)
   ProfileCounts counts;
   if (CountProfileInformation(manager, &counts)) {
-    size_t limited_total = counts.total;
-    size_t limited_signedin = counts.signedin;
+    int limited_total = counts.total;
+    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);
     }
     UpdateReportedOSProfileStatistics(limited_total, limited_signedin);
   }
-#endif
 }
 
 void ProfileMetrics::LogNumberOfProfileSwitches() {
   UMA_HISTOGRAM_COUNTS_100("Profile.NumberOfSwitches",
                            number_of_profile_switches_);
 }
 
-// The OS_MACOSX implementation of this function is in profile_metrics_mac.mm.
-#if defined(OS_WIN)
-void ProfileMetrics::UpdateReportedOSProfileStatistics(
-    size_t active, size_t 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);
     UMA_HISTOGRAM_COUNTS_100("Profile.NumberOfProfilesWithAuthErrors",
                              counts.auth_errors);
 
     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 297 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);
 }