[Merge M49] Add Startup.SameVersionStartupCount histogram

components/startup_metric_utils/browser/startup_metric_utils.cc

 // Copyright 2013 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 "components/startup_metric_utils/browser/startup_metric_utils.h"
 
 #include <stddef.h>
 
 #include "base/containers/hash_tables.h"
 #include "base/environment.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/prefs/pref_registry_simple.h"
 #include "base/prefs/pref_service.h"
 #include "base/process/process_info.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/sys_info.h"
 #include "base/threading/platform_thread.h"
 #include "base/trace_event/trace_event.h"
 #include "build/build_config.h"
+#include "components/startup_metric_utils/browser/pref_names.h"
+#include "components/version_info/version_info.h"
 
 #if defined(OS_WIN)
 #include <winternl.h>
 #include "base/win/win_util.h"
 #include "base/win/windows_version.h"
 #endif
 
 namespace startup_metric_utils {
 
 namespace {
 
-const char kLastStartupTimestampPref[] =
-    "startup_metric.last_startup_timestamp";
-
 // Mark as volatile to defensively make sure usage is thread-safe.
 // Note that at the time of this writing, access is only on the UI thread.
 volatile bool g_non_browser_ui_displayed = false;
 
 base::LazyInstance<base::TimeTicks>::Leaky g_process_creation_ticks =
     LAZY_INSTANCE_INITIALIZER;
 
 base::LazyInstance<base::TimeTicks>::Leaky g_browser_main_entry_point_ticks =
     LAZY_INSTANCE_INITIALIZER;
 
@@ skipping 353 matching lines @@
       return false;
     index += proc_info->NextEntryOffset;
   }
 
   return false;
 }
 #endif  // defined(OS_WIN)
 
 void RegisterPrefs(PrefRegistrySimple* registry) {
   DCHECK(registry);
-  registry->RegisterInt64Pref(kLastStartupTimestampPref, 0);
+  registry->RegisterInt64Pref(prefs::kLastStartupTimestamp, 0);
+  registry->RegisterStringPref(prefs::kLastStartupVersion, std::string());
+  registry->RegisterIntegerPref(prefs::kSameVersionStartupCount, 0);
 }
 
 bool WasNonBrowserUIDisplayed() {
   return g_non_browser_ui_displayed;
 }
 
 void SetNonBrowserUIDisplayed() {
   g_non_browser_ui_displayed = true;
 }
 
@@ skipping 87 matching lines @@
 void RecordTimeSinceLastStartup(PrefService* pref_service) {
 #if defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX)
   DCHECK(pref_service);
 
   // Get the timestamp of the current startup.
   const base::Time process_start_time =
       base::CurrentProcessInfo::CreationTime();
 
   // Get the timestamp of the last startup from |pref_service|.
   const int64_t last_startup_timestamp_internal =
-      pref_service->GetInt64(kLastStartupTimestampPref);
+      pref_service->GetInt64(prefs::kLastStartupTimestamp);
   if (last_startup_timestamp_internal != 0) {
     // Log the Startup.TimeSinceLastStartup histogram.
     const base::Time last_startup_timestamp =
         base::Time::FromInternalValue(last_startup_timestamp_internal);
     const base::TimeDelta time_since_last_startup =
         process_start_time - last_startup_timestamp;
     const int minutes_since_last_startup = time_since_last_startup.InMinutes();
 
     // Ignore negative values, which can be caused by system clock changes.
     if (minutes_since_last_startup >= 0) {
       UMA_HISTOGRAM_WITH_STARTUP_TEMPERATURE(
           UMA_HISTOGRAM_TIME_IN_MINUTES_MONTH_RANGE,
           "Startup.TimeSinceLastStartup", minutes_since_last_startup);
     }
   }
 
   // Write the timestamp of the current startup in |pref_service|.
-  pref_service->SetInt64(kLastStartupTimestampPref,
+  pref_service->SetInt64(prefs::kLastStartupTimestamp,
                          process_start_time.ToInternalValue());
 #endif  // defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX)
 }
 
+void RecordStartupCount(PrefService* pref_service) {
+  DCHECK(pref_service);
+
+  const std::string current_version = version_info::GetVersionNumber();
+
+  int startups_with_current_version = 0;
+  if (current_version == pref_service->GetString(prefs::kLastStartupVersion)) {
+    startups_with_current_version =
+        pref_service->GetInteger(prefs::kSameVersionStartupCount);
+    ++startups_with_current_version;
+    pref_service->SetInteger(prefs::kSameVersionStartupCount,
+                             startups_with_current_version);
+  } else {
+    startups_with_current_version = 1;
+    pref_service->SetString(prefs::kLastStartupVersion, current_version);
+    pref_service->SetInteger(prefs::kSameVersionStartupCount, 1);
+  }
+
+  UMA_HISTOGRAM_COUNTS_100("Startup.SameVersionStartupCount",
+                           startups_with_current_version);
+}
+
 void RecordBrowserWindowDisplay(const base::TimeTicks& ticks) {
   static bool is_first_call = true;
   if (!is_first_call || ticks.is_null())
     return;
   is_first_call = false;
   if (WasNonBrowserUIDisplayed() || g_process_creation_ticks.Get().is_null())
     return;
 
   UMA_HISTOGRAM_AND_TRACE_WITH_STARTUP_TEMPERATURE(
       UMA_HISTOGRAM_LONG_TIMES, "Startup.BrowserWindowDisplay",
@@ skipping 79 matching lines @@
 
 base::TimeTicks MainEntryPointTicks() {
   return g_browser_main_entry_point_ticks.Get();
 }
 
 StartupTemperature GetStartupTemperature() {
   return g_startup_temperature;
 }
 
 }  // namespace startup_metric_utils