Bump os-upgrade component of Active Setup version on-os-upgrade.

chrome/installer/setup/install_worker.cc

Index: chrome/installer/setup/install_worker.cc
diff --git a/chrome/installer/setup/install_worker.cc b/chrome/installer/setup/install_worker.cc
index e5d092a02be57cfadc8bc1e1b0a90bb66fa88444..1ca8dd5ae6aafade6e26b71b337e7253a55462b7 100644
--- a/chrome/installer/setup/install_worker.cc
+++ b/chrome/installer/setup/install_worker.cc
@@ -20,7 +20,6 @@
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
-#include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/version.h"
@@ -536,32 +535,6 @@ void CleanupBadCanaryDelegateExecuteRegistration(
   }
 }
 
-// Returns the version to be used for Active Setup as MM,XX,YY,ZZ where MM is
-// |kActiveSetupMajorVersion| and other components may be updated in various
-// situations. At this point YY represents the number of on-os-upgrade that were
-// handled by this installation and XX/ZZ are unused.
-base::string16 GetActiveSetupVersionFromExisting(
-    const base::string16& existing_version) {
-  // The major version and first component of the version identifying the work
-  // done by setup.exe --configure-user-settings on user login by way of Active
-  // Setup.  Increase this value if the work done in setup_main.cc's handling of
-  // kConfigureUserSettings changes and should be executed again for all users.
-  const base::char16 kActiveSetupMajorVersion[] = L"43";
-
-  std::vector<base::string16> version_components = base::SplitString(
-      existing_version, L",", base::TRIM_WHITESPACE, base::SPLIT_WANT_NONEMPTY);
-
-  // If |existing_version| was empty or otherwise corrupted, turn it into a
-  // valid one.
-  if (version_components.size() != 4U)
-    version_components.assign(4U, L"0");
-
-  // Unconditionally update the major version.
-  version_components[0] = kActiveSetupMajorVersion;
-
-  return JoinString(version_components, L',');
-}
-
 }  // namespace
 
 // This method adds work items to create (or update) Chrome uninstall entry in
@@ -1478,11 +1451,17 @@ void AddActiveSetupWorkItems(const InstallerState& installer_state,
                                static_cast<DWORD>(1U),
                                true);
 
-  list->AddSetRegValueWorkItem(root,
-                               active_setup_path,
-                               WorkItem::kWow64Default,
-                               L"Version",
-                               base::Bind(&GetActiveSetupVersionFromExisting));
+  // The major version and first component of the version identifying the work
+  // done by setup.exe --configure-user-settings on user login by way of Active
+  // Setup.  Increase this value if the work done in setup_main.cc's handling of
+  // kConfigureUserSettings changes and should be executed again for all users.
+  const int kActiveSetupMajorVersion = 43;
+
+  list->AddSetRegValueWorkItem(
+      root, active_setup_path, WorkItem::kWow64Default, L"Version",
+      base::Bind(&InstallUtil::GetActiveSetupVersionFromExisting,
+                 InstallUtil::MAJOR, InstallUtil::SET,
+                 kActiveSetupMajorVersion));
 }
 
 void AddDeleteOldIELowRightsPolicyWorkItems(