Update the sw_reporter version code

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 78 matching lines @@
 const char kSRTPromptOnGroup[] = "On";
 
 // Exit codes that identify that a cleanup is needed.
 const int kCleanupNeeded = 0;
 const int kPostRebootCleanupNeeded = 4;
 
 void ReportUmaStep(SwReporterUmaValue value) {
   UMA_HISTOGRAM_ENUMERATION("SoftwareReporter.Step", value, SW_REPORTER_MAX);
 }
 
-void ReportUmaVersion(const base::Version& version) {
+void ReportVersionWithUma(const base::Version& version) {
   DCHECK(!version.components().empty());
-  UMA_HISTOGRAM_SPARSE_SLOWLY("SoftwareReporter.MinorVersion",
-                              version.components().back());
-  // The major version uses the 1st component value (when there is more than
-  // one, since the last one is always the minor version) as a hi word in a
-  // double word. The low word is either the second component (when there are
-  // only three) or the 3rd one if there are at least 4. E.g., for W.X.Y.Z, we
-  // ignore X, and Z is the minor version. We compute the major version with W
-  // as the hi word, and Y as the low word. For X.Y.Z, we use X and Y as hi and
-  // low words, and if we would have Y.Z we would use Y as the hi word and 0 as
-  // the low word. major version is 0 if the version only has one component.
+  // 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

[csharp, 2014/10/28 19:09:33]

I removed the talked about what component maps to which word and just added the
expression. I think this seems clearer, but let me know if that is just me being
crazy :)

[MAD, 2014/10/29 01:06:50]

Acknowledged.

+  // components, only the first three count, and if there are less than 3, the
+  // missing values are just replaced by zero.
   uint32_t major_version = 0;
-  if (version.components().size() > 1)
-    major_version = 0x10000 * version.components()[0];
-  if (version.components().size() < 4 && version.components().size() > 2)
-    major_version += version.components()[1];
-  else if (version.components().size() > 3)
+  if (version.components().size() >= 1)

[MAD, 2014/10/29 01:06:50]

Since we DCHECK that components() is not empty above, we don't need to test for
>= 1 (and we already used [0] above even when size <= 1.

[csharp, 2014/10/31 14:29:48]

Done.

+    major_version = 0x1000000 * version.components()[0];

[MAD, 2014/10/29 01:06:50]

We should add DCHECKs that components are of the expected sizes, e.g., < 0x100
for the first and third, and smaller than 0x10000 for the second one.

[csharp, 2014/10/31 14:29:48]

Done.

+  if (version.components().size() >= 2)
+    major_version += 0x100 * version.components()[1];
+  if (version.components().size() >= 3)
     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.
 void ReportAndClearExitCode(int exit_code, const std::string& version) {
@@ skipping 104 matching lines @@
 
   virtual bool OnCustomInstall(const base::DictionaryValue& manifest,
                                const base::FilePath& install_dir) {
     return true;
   }
 
   virtual void ComponentReady(const base::Version& version,
                               const base::FilePath& install_dir,
                               scoped_ptr<base::DictionaryValue> manifest) {
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-    ReportUmaVersion(version);
+    ReportVersionWithUma(version);
 
     wcsncpy_s(version_dir_,
               _MAX_PATH,
               install_dir.value().c_str(),
               install_dir.value().size());
 
     // A previous run may have results in the registry, so check and report
     // them if present.
     std::string version_string(version.GetString());
     base::win::RegKey srt_key(
@@ skipping 99 matching lines @@
       -1,
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
 
   registry->RegisterStringPref(
       prefs::kSwReporterPromptVersion,
       "",
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
 }
 
 }  // namespace component_updater