Add fixing of MSI DisplayVersion to Chrome installs/updates.

chrome/installer/setup/install_worker_unittest.cc

 // Copyright (c) 2012 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/installer/setup/install_worker.h"
 
 #include "base/win/registry.h"
 #include "base/version.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/installer/setup/setup_util.h"
@@ skipping 654 matching lines @@
               AddDeleteRegValueWorkItem(
                   Eq(installer_state->root_key()),
                   StrEq(chrome_dist->GetStateKey()),
                   StrEq(google_update::kRegUsageStatsField))).Times(1);
 
   AddUsageStatsWorkItems(*installation_state.get(),
                          *installer_state.get(),
                          &work_item_list);
 }
 
+TEST_F(InstallWorkerTest, ConvertGUIDToMSIUserDataFormatTest) {
+  base::string16 converted_empty_guid(
+      installer::ConvertGUIDToMSIUserDataFormat(L""));
+  EXPECT_TRUE(converted_empty_guid.empty());
+
+  base::string16 malformed_guid(
+      installer::ConvertGUIDToMSIUserDataFormat(L"Marmite!"));
+  EXPECT_TRUE(malformed_guid.empty());
+
+  base::string16 short_guid(
+      installer::ConvertGUIDToMSIUserDataFormat(
+          L"Marmite!-Marm-Mite-Marm-Mite"));
+  EXPECT_TRUE(short_guid.empty());
+
+  base::string16 long_guid(
+      installer::ConvertGUIDToMSIUserDataFormat(
+          L"Marmite!-Marm-Mite-Marm-MiteMarmiteMarmiteMarmite"));
+  EXPECT_TRUE(long_guid.empty());
+
+  base::string16 off_by_one_guid(
+      installer::ConvertGUIDToMSIUserDataFormat(
+          L"Marmite!!-Marm-Mite-Marm-MiteMarmite"));
+  EXPECT_TRUE(long_guid.empty());
+
+  base::string16 correct_guid(
+      installer::ConvertGUIDToMSIUserDataFormat(
+          L"BED0D2F3-7407-3B43-A48F-6C33BC3D5DAD"));
+  EXPECT_EQ(L"3F2D0DEB704734B34AF8C633CBD3D5DA", correct_guid);
+}
+
 // The Quick Enable tests only make sense for the Google Chrome build as it
 // interacts with registry values that are specific to Google Update.
 #if defined(GOOGLE_CHROME_BUILD)
 
 // Test scenarios under which the quick-enable-cf command should not exist after
 // the run.  We're permissive in that we allow the DeleteRegKeyWorkItem even if
 // it isn't strictly needed.
 class QuickEnableAbsentTest : public InstallWorkerTest {
  public:
   virtual void SetUp() {
@@ skipping 113 matching lines @@
               prod_type_list[i_type_check]);
           bool prod_expect = (mach_after & (1 << i_type_check)) != 0;
           EXPECT_EQ(prod_expect, prod_res);
         }
       }
     }
   }
 }
 
 #endif  // defined(GOOGLE_CHROME_BUILD)