Revert of Report whether a reboot happened since the SRT asked for one.

chrome/browser/component_updater/sw_reporter_installer_win.cc

 // Copyright (c) 2014 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/component_updater/sw_reporter_installer_win.h"
 
 #include <stdint.h>
 #include <string>
 #include <vector>
 
@@ skipping 76 matching lines @@
 const wchar_t kVersionRegistryValueName[] = L"Version";
 const wchar_t kStartTimeRegistryValueName[] = L"StartTime";
 const wchar_t kEndTimeRegistryValueName[] = L"EndTime";
 
 // Field trial strings.
 const char kSRTPromptTrialName[] = "SRTPromptFieldTrial";
 const char kSRTPromptOnGroup[] = "On";
 
 // Exit codes that identify that a cleanup is needed.
 const int kCleanupNeeded = 0;
-const int kNothingFound = 2;
 const int kPostRebootCleanupNeeded = 4;
-const int kDelayedPostRebootCleanupNeeded = 15;
 
 void ReportUmaStep(SwReporterUmaValue value) {
   UMA_HISTOGRAM_ENUMERATION("SoftwareReporter.Step", value, SW_REPORTER_MAX);
 }
 
 void ReportVersionWithUma(const base::Version& version) {
   DCHECK(!version.components().empty());
   // The minor version is the 2nd last component of the version,
   // or just the first component if there is only 1.
   uint32_t minor_version = 0;
   if (version.components().size() > 1)
     minor_version = version.components()[version.components().size() - 2];
   else
     minor_version = version.components()[0];
   UMA_HISTOGRAM_SPARSE_SLOWLY("SoftwareReporter.MinorVersion", minor_version);
 
   // The major version for X.Y.Z is X*256^3+Y*256+Z. If there are additional
   // components, only the first three count, and if there are less than 3, the
   // missing values are just replaced by zero. So 1 is equivalent 1.0.0.
-  DCHECK_LT(version.components()[0], 0x100);
+  DCHECK(version.components()[0] < 0x100);
   uint32_t major_version = 0x1000000 * version.components()[0];
   if (version.components().size() >= 2) {
-    DCHECK_LT(version.components()[1], 0x10000);
+    DCHECK(version.components()[1] < 0x10000);
     major_version += 0x100 * version.components()[1];
   }
   if (version.components().size() >= 3) {
-    DCHECK_LT(version.components()[2], 0x100);
+    DCHECK(version.components()[2] < 0x100);
     major_version += version.components()[2];
   }
   UMA_HISTOGRAM_SPARSE_SLOWLY("SoftwareReporter.MajorVersion", major_version);
 }
 
 // This function is called on the UI thread to report the SwReporter exit code
 // and then clear it from the registry as well as clear the execution state
 // from the local state. This could be called from an interruptible worker
 // thread so should be resilient to unexpected shutdown. |version| is provided
 // so the kSwReporterPromptVersion prefs can be set.
@@ skipping 210 matching lines @@
   if (cleaner_key.Valid() &&
       cleaner_key.HasValue(kStartTimeRegistryValueName)) {
     // Get version number.
     if (cleaner_key.HasValue(kVersionRegistryValueName)) {
       DWORD version;
       cleaner_key.ReadValueDW(kVersionRegistryValueName, &version);
       UMA_HISTOGRAM_SPARSE_SLOWLY("SoftwareReporter.Cleaner.Version", version);
       cleaner_key.DeleteValue(kVersionRegistryValueName);
     }
     // Get start & end time. If we don't have an end time, we can assume the
-    // cleaner has not completed.
-    int64 start_time_value;
-    cleaner_key.ReadInt64(kStartTimeRegistryValueName, &start_time_value);
-
+    // cleaner has crashed.
     bool completed = cleaner_key.HasValue(kEndTimeRegistryValueName);
     UMA_HISTOGRAM_BOOLEAN("SoftwareReporter.Cleaner.HasCompleted", completed);
     if (completed) {
+      int64 start_time_value;
+      cleaner_key.ReadInt64(kStartTimeRegistryValueName, &start_time_value);
       int64 end_time_value;
       cleaner_key.ReadInt64(kEndTimeRegistryValueName, &end_time_value);
       cleaner_key.DeleteValue(kEndTimeRegistryValueName);
       base::TimeDelta run_time(base::Time::FromInternalValue(end_time_value) -
           base::Time::FromInternalValue(start_time_value));
       UMA_HISTOGRAM_LONG_TIMES("SoftwareReporter.Cleaner.RunningTime",
           run_time);
     }
-    // Get exit code. Assume nothing was found if we can't read the exit code.
-    DWORD exit_code = kNothingFound;
+    // Get exit code.
     if (cleaner_key.HasValue(kExitCodeRegistryValueName)) {
+      DWORD exit_code;
       cleaner_key.ReadValueDW(kExitCodeRegistryValueName, &exit_code);
       UMA_HISTOGRAM_SPARSE_SLOWLY("SoftwareReporter.Cleaner.ExitCode",
           exit_code);
       cleaner_key.DeleteValue(kExitCodeRegistryValueName);
     }
     cleaner_key.DeleteValue(kStartTimeRegistryValueName);
-
-    if (exit_code == kPostRebootCleanupNeeded ||
-        exit_code == kDelayedPostRebootCleanupNeeded) {
-      // Check if we are running after the user has rebooted.
-      base::TimeDelta elapsed(base::Time::Now() -
-                              base::Time::FromInternalValue(start_time_value));
-      DCHECK_GT(elapsed.InMilliseconds(), 0);
-      UMA_HISTOGRAM_BOOLEAN(
-          "SoftwareReporter.Cleaner.HasRebooted",
-          static_cast<uint64>(elapsed.InMilliseconds()) > ::GetTickCount64());
-    }
   }
 
   // Install the component.
   scoped_ptr<ComponentInstallerTraits> traits(
       new SwReporterInstallerTraits(prefs));
   // |cus| will take ownership of |installer| during installer->Register(cus).
   DefaultComponentInstaller* installer =
       new DefaultComponentInstaller(traits.Pass());
   installer->Register(cus);
 }
@@ skipping 10 matching lines @@
       -1,
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
 
   registry->RegisterStringPref(
       prefs::kSwReporterPromptVersion,
       "",
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
 }
 
 }  // namespace component_updater