[Chromoting] Avoid potential conflicts leading to pending reboots while upgrading the me2me host:

remoting/host/win/chromoting.wxs

 <?xml version="1.0"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
 
   <?define EventSourceName = "chromoting" ?>
   <?define ServiceName = "chromoting" ?>
 
   <!-- TODO(alexeypa): There strings should be localized,
        see http://crbug.com/121785 -->
   <?if $(var.Branding) ~= Chrome ?>
     <?define ChromotingHost = "Chrome Remote Desktop Host" ?>
     <?define ChromotingServiceName = "Chrome Remote Desktop Service" ?>
     <?define ChromotingServiceDescription = "This service enables incoming connections from Chrome Remote Desktop clients." ?>
     <?define Manufacturer = "Google Inc." ?>
   <?else?>
     <?define ChromotingHost = "Chromoting Host" ?>
     <?define ChromotingServiceName = "Chromoting Service" ?>
     <?define ChromotingServiceDescription = "This service enables incoming connections from Chromoting clients." ?>
     <?define Manufacturer = "The Chromium Authors" ?>
   <?endif?>
 
   <?define FirewallName = "$(var.ChromotingHost)" ?>
 
   <?define OmahaAppid = "{b210701e-ffc4-49e3-932b-370728c72662}" ?>
   <?define UpgradeCode = "2b21f767-e157-4fa6-963c-55834c1433a6" ?>
 
   <?define ControllerAppid = "{4ff35d5e-d226-4550-9248-03e7779e67de}" ?>
   <?define ControllerBinary = "remoting_host_controller.exe" ?>
   <?define ControllerClass = "ElevatedController Class" ?>
-  <?define ControllerClsid = "{430a9403-8176-4733-afdc-0b325a8fda84}" ?>
   <?define ControllerProgid =
     "ChromotingElevatedController.ElevatedController" ?>
   <?define ControllerTypelib = "{9d9a5a2c-576e-4acd-9c75-aabff74b205d}" ?>
 
   <!--
     The long hex value below is a security descriptor that allows SYSTEM,
     built-in administrators and interactive users to call methods of a COM
     object (COM_RIGHTS_EXECUTE and COM_RIGHTS_EXECUTE_LOCAL). The security
     descriptor was generated from SDDL definition using the PowerShell script
     below:
 
       $sddl = "O:BAG:BAD:(A;;0x3;;;IU)(A;;0x3;;;SY)(A;;0x3;;;BA)"
       $i = ([wmiclass]"Win32_SecurityDescriptorHelper").SDDLToBinarySD($sddl).BinarySD
       -join ($i | foreach {$_.ToString("X2")})
   -->
   <?define ControllerSd = "010004805C0000006C00000000000000140000000200480003000000000014000300000001010000000000050400000000001400030000000101000000000005120000000000180003000000010200000000000520000000200200000102000000000005200000002002000001020000000000052000000020020000" ?>
 
+  <?ifndef ControllerClsid ?>
+    <?error ControllerClsid must be defined ?>
+  <?endif?>
+
   <?ifndef FileSource ?>
     <?error FileSource must be defined ?>
   <?endif?>
 
   <?ifndef IconPath ?>
     <?error IconPath must be defined ?>
   <?endif?>
 
   <?ifndef SasDllPath ?>
     <?error SasDllPath must be defined ?>
@@ skipping 26 matching lines @@
       AllowSameVersionUpgrades="yes"
       DowngradeErrorMessage="A later version of [ProductName] is already installed. Setup will now exit."
       Schedule="afterInstallInitialize" />
 
     <Media Id="1" Cabinet="chromoting.cab" EmbedCab="yes"/>
 
     <Directory Id="TARGETDIR" Name="SourceDir">
       <Directory Id="ProgramFilesFolder">
         <?ifdef OfficialBuild ?>
           <Directory Id="program_files_google" Name="Google">
-            <Directory Id="binaries" Name="Chrome Remote Desktop"/>
+            <Directory Id="chromoting" Name="Chrome Remote Desktop">
+              <Directory Id="binaries" Name="$(var.Version)"/>
+            </Directory>
           </Directory>
         <?else?>
-          <Directory Id="binaries" Name="Chromoting"/>
+          <Directory Id="chromoting" Name="Chromoting">
+            <Directory Id="binaries" Name="$(var.Version)"/>
+          </Directory>
         <?endif?>
       </Directory>
       <Directory Id="CommonAppDataFolder">
         <?ifdef OfficialBuild ?>
           <Directory Id="common_app_data_google" Name="Google">
             <Directory Id="config_files" Name="Chrome Remote Desktop"/>
           </Directory>
         <?else?>
           <Directory Id="config_files" Name="Chromoting"/>
         <?endif?>
@@ skipping 103 matching lines @@
             <RegistryValue Type="string"
                            Value="$(var.ControllerClass)"/>
 
             <RegistryKey Key="CLSID" Action="create">
               <RegistryValue Type="string"
                              Value="$(var.ControllerClsid)"/>
             </RegistryKey>
 
             <RegistryKey Key="CurVer" Action="create">
               <RegistryValue Type="string"
-                             Value="$(var.ControllerProgid).1"/>
+                             Value="$(var.ControllerProgid).$(var.Version)"/>
             </RegistryKey>
           </RegistryKey>
 
-          <RegistryKey Key="$(var.ControllerProgid).1" Action="create">
+          <RegistryKey Key="$(var.ControllerProgid).$(var.Version)"
+                       Action="create">
             <RegistryValue Type="string"
                            Value="$(var.ControllerClass)"/>
 
             <RegistryKey Key="CLSID" Action="create">
               <RegistryValue Type="string"
                              Value="$(var.ControllerClsid)"/>
             </RegistryKey>
           </RegistryKey>
 
           <RegistryKey Key="CLSID">
             <RegistryKey Key="$(var.ControllerClsid)" Action="create">
               <RegistryValue Type="string"
                              Value="$(var.ControllerClass)"/>
 
               <RegistryValue Type="string"
                              Name="AppID"
                              Value="$(var.ControllerAppid)"/>
 
               <RegistryValue Type="string"
                              Name="LocalizedString"
                              Value="@[#$(var.ControllerBinary)],-100"/>
 
               <RegistryKey Key="LocalServer32" Action="create">
                 <RegistryValue Type="string"
                                Value="[#$(var.ControllerBinary)]"/>
               </RegistryKey>
 
               <RegistryKey Key="ProgID" Action="create">
                 <RegistryValue Type="string"
-                               Value="$(var.ControllerProgid).1"/>
+                               Value="$(var.ControllerProgid).$(var.Version)"/>
               </RegistryKey>
 
               <RegistryKey Key="TypeLib" Action="create">
                 <RegistryValue Type="string"
                                Value="$(var.ControllerTypelib)"/>
               </RegistryKey>
 
               <RegistryKey Key="VersionIndependentProgID" Action="create">
                 <RegistryValue Type="string"
                                Value="$(var.ControllerProgid)"/>
@@ skipping 141 matching lines @@
       </Custom>
       <Custom Action="set_service_display_name" Before="InstallInitialize">
         <![CDATA[VersionNT >= 600]]>
       </Custom>
       <Custom Action="set_service_description" Before="InstallInitialize">
         <![CDATA[VersionNT >= 600]]>
       </Custom>
     </InstallExecuteSequence>
   </Product>
 </Wix>