Clear yet another few stats when a new chrome version is installed

Re-review with Laforge found that three stats were registered, but not
cleared when we create a new version.  This CL clears those stats.

I also cleaned a tiny fragment that relates to one stat (moving the
setting of the stat into a conditional... which may make code more 
readable).


r=huanr
Review URL: http://codereview.chromium.org/155722

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21047 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 5 insertions, 2 deletions

diff --git a/chrome/browser/metrics/metrics_service.cc b/chrome/browser/metrics/metrics_service.cc
index 3b3b149..f36e0aa 100644
--- a/chrome/browser/metrics/metrics_service.cc
+++ b/chrome/browser/metrics/metrics_service.cc
@@ -353,6 +353,7 @@ void MetricsService::RegisterPrefs(PrefService* local_state) {
 // static
 void MetricsService::DiscardOldStabilityStats(PrefService* local_state) {
   local_state->SetBoolean(prefs::kStabilityExitedCleanly, true);
+  local_state->SetBoolean(prefs::kStabilitySessionEndCompleted, true);
 
   local_state->SetInteger(prefs::kStabilityIncompleteSessionEndCount, 0);
   local_state->SetInteger(prefs::kStabilityBreakpadRegistrationSuccess, 0);
@@ -370,6 +371,8 @@ void MetricsService::DiscardOldStabilityStats(PrefService* local_state) {
   local_state->SetInteger(prefs::kSecurityRendererOnSboxDesktop, 0);
   local_state->SetInteger(prefs::kSecurityRendererOnDefaultDesktop, 0);
 
+  local_state->SetString(prefs::kStabilityLaunchTimeSec, L"0");
+  local_state->SetString(prefs::kStabilityLastTimestampSec, L"0");
   local_state->SetString(prefs::kStabilityUptimeSec, L"0");
 
   local_state->ClearPref(prefs::kStabilityPluginStats);
@@ -676,9 +679,9 @@ void MetricsService::InitializeMetricsState() {
 
   if (!pref->GetBoolean(prefs::kStabilitySessionEndCompleted)) {
     IncrementPrefValue(prefs::kStabilityIncompleteSessionEndCount);
+    // This is marked false when we get a WM_ENDSESSION.
+    pref->SetBoolean(prefs::kStabilitySessionEndCompleted, true);
   }
-  // This is marked false when we get a WM_ENDSESSION.
-  pref->SetBoolean(prefs::kStabilitySessionEndCompleted, true);
 
   int64 last_start_time = pref->GetInt64(prefs::kStabilityLaunchTimeSec);
   int64 last_end_time = pref->GetInt64(prefs::kStabilityLastTimestampSec);