Enable x64 Chromoting host and installer

remoting/host/installer/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?>
 
+  <?if $(sys.BUILDARCH) = "x64" ?>
+    <?define ProgramFilesFolderForPlatform = "ProgramFiles64Folder" ?>
+  <?else?>
+    <?define ProgramFilesFolderForPlatform = "ProgramFilesFolder" ?>
+  <?endif?>
+
   <?if $(var.OfficialBuild) != 0 ?>
     <?define ChromotingKeyPath = "Google\Chrome Remote Desktop" ?>
   <?else?>
     <?define ChromotingKeyPath = "Chromoting" ?>
   <?endif?>
 
   <?define FirewallName = "$(var.ChromotingHost)" ?>
 
   <?define OmahaAppid = "{b210701e-ffc4-49e3-932b-370728c72662}" ?>
   <?define UpgradeCode = "2b21f767-e157-4fa6-963c-55834c1433a6" ?>
@@ skipping 96 matching lines @@
                       Property="BROKENUSAGESTATSVERSION" />
     </Upgrade>
 
     <Condition Message="A later version of [ProductName] is already installed. Setup will now exit.">
       NOT NEWERVERSIONDETECTED
     </Condition>
 
     <Media Id="1" Cabinet="chromoting.cab" EmbedCab="yes"/>
 
     <Directory Id="TARGETDIR" Name="SourceDir">
-      <Directory Id="ProgramFilesFolder">
+      <Directory Id="$(var.ProgramFilesFolderForPlatform)">
         <?if $(var.OfficialBuild) != 0 ?>
           <Directory Id="program_files_google" Name="Google">
             <Directory Id="chromoting" Name="Chrome Remote Desktop">
               <Directory Id="binaries" Name="$(var.Version)"/>
             </Directory>
           </Directory>
         <?else?>
           <Directory Id="chromoting" Name="Chromoting">
             <Directory Id="binaries" Name="$(var.Version)"/>
           </Directory>
@@ skipping 412 matching lines @@
           <RegistryKey Key="com.google.chrome.remote_assistance"
                        Action="create">
             <RegistryValue
                 Type="string"
                 Value="[binaries]com.google.chrome.remote_assistance.json"/>
           </RegistryKey>
         </RegistryKey>
         <CreateFolder/>
       </Component>
 
-      <!-- Register with Sawbuck. See http://code.google.com/p/sawbuck/. -->
-      <Component Id="sawbuck_provider" Guid="*">
+      <!-- Delete the usagestats flag to reset the crash dump reporting settings
+           for existing users. -->
+      <Component Id="delete_usagestats"
+                 Guid="5c73f2b9-b865-426f-81cc-90a27ebb54aa"
+                 KeyPath="yes">
+        <Condition>BROKENUSAGESTATSVERSION</Condition>
+        <RemoveRegistryValue
+            Id="usagestats"
+            Key="SOFTWARE\Google\Update\ClientStateMedium\$(var.OmahaAppid)"
+            Name="usagestats"
+            Root="HKLM" />
+      </Component>
+
+    </DirectoryRef>
+
+    <!-- Register with Sawbuck. See http://code.google.com/p/sawbuck/. -->
+    <DirectoryRef Id="TARGETDIR">
+      <Component Id="sawbuck_provider" Guid="*" Win64="no">
         <RegistryKey Root="HKLM"
                      Key="SOFTWARE\Google\Sawbuck\Providers">
           <RegistryKey Key="{2db51ca1-4fd8-4b88-b5a2-fb8606b66b02}"
                        Action="create">
             <RegistryValue Type="string" Value="Chromoting"/>
             <RegistryValue Name="default_flags" Type="integer" Value="1"/>
             <RegistryValue Name="default_level" Type="integer" Value="4"/>
             <RegistryKey Key="Flags" Action="create">
               <RegistryKey Key="Stack Trace" Action="create">
                 <RegistryValue Type="integer" Value="1"/>
               </RegistryKey>
               <RegistryKey Key="Text Only" Action="create">
                 <RegistryValue Type="integer" Value="2"/>
               </RegistryKey>
             </RegistryKey>
           </RegistryKey>
         </RegistryKey>
       </Component>
-
-      <!-- Delete the usagestats flag to reset the crash dump reporting settings
-           for existing users. -->
-      <Component Id="delete_usagestats"
-                 Guid="5c73f2b9-b865-426f-81cc-90a27ebb54aa"
-                 KeyPath="yes">
-        <Condition>BROKENUSAGESTATSVERSION</Condition>
-        <RemoveRegistryValue
-            Id="usagestats"
-            Key="SOFTWARE\Google\Update\ClientStateMedium\$(var.OmahaAppid)"
-            Name="usagestats"
-            Root="HKLM" />
-      </Component>
-
     </DirectoryRef>
 
     <DirectoryRef Id="config_files">
       <!-- Delete debug.log from previous versions -->
       <Component Id="delete_debug_log"
                  Guid="b309082a-e6fa-4dc7-98e4-3d83c896561d">
         <RemoveFile Id="debug.log"
                     Name="debug.log"
                     On="both" />
       </Component>
@@ skipping 91 matching lines @@
       <Custom Action="set_service_description" Before="InstallInitialize">
         <![CDATA[VersionNT >= 600]]>
       </Custom>
 
       <!-- Schedule RemoveExistingProducts before installing any files.
            See http://msdn.microsoft.com/en-us/library/aa371197.aspx. -->
       <RemoveExistingProducts After="InstallInitialize" />
     </InstallExecuteSequence>
   </Product>
 </Wix>