The Chromoting service should not start automatically unless it was configured from the webapp to d…

remoting/host/installer/chromoting.wxs

 <?xml version="1.0"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
 
   <?define EventSourceName = "chromoting" ?>
   <?define ServiceName = "chromoting" ?>
 
   <?ifdef OfficialBuild ?>
     <?define ChromotingHost = "Chrome Remote Desktop Host" ?>
     <?define FirewallName = "Chrome Remote Desktop Host" ?>
     <?define Manufacturer = "Google Inc." ?>
@@ skipping 90 matching lines @@
               Name="remoting_service.exe"
               Vital="yes"/>
 
         <ServiceInstall Id="install_service"
                         Type="ownProcess"
                         Vital="yes"
                         Name="$(var.ServiceName)"
                         DisplayName="@[#remoting_service.exe],-101"
                         Description="@[#remoting_service.exe],-102"
                         Arguments="--host-binary=&quot;[#remoting_me2me_host.exe]&quot; --auth-config=&quot;[config_files]host.json&quot; --host-config=&quot;[config_files]host.json&quot;"
-                        Start="auto"
+                        Start="demand"
                         Account="LocalSystem"
                         ErrorControl="ignore"
                         Interactive="no" />
 
         <ServiceControl Id="start_service"
                         Stop="both"
                         Remove="uninstall"
                         Name="$(var.ServiceName)"
                         Wait="yes" />
 
@@ skipping 158 matching lines @@
                                  Value="[binaries]"/>
                 </RegistryKey>
               </RegistryKey>
             </RegistryKey>
           </RegistryKey>
         </RegistryKey>
 
       </Component>
     </DirectoryRef>
 
+    <!-- The service is always installed in the stopped state with start type
+         set to 'manual'. This becomes a problem when upgrading an existing
+         installation that is configured to start the service automatically.
+
+         Here we check the startup type before making any changes, then restart
+         the service and change its startup type as needed once the installation
+         is finished. -->
+    <Property Id="CHROMOTING_SERVICE_START_TYPE">
+      <RegistrySearch Id="chromoting_service_start_type"
+                      Root="HKLM"
+                      Key="SYSTEM\CurrentControlSet\services\$(var.ServiceName)"
+                      Name="Start"
+                      Type="raw" />
+    </Property>
+
+    <CustomAction Id="query_auto_start_service"
+                  Property="auto_start_service"
+                  Value="[CHROMOTING_SERVICE_START_TYPE]" />
+
+    <CustomAction Id="set_auto_start_service" Script="jscript">
+      <![CDATA[
+        var controller = new ActiveXObject("$(var.ControllerProgid)");
+        controller.StartDaemon();
+      ]]>
+    </CustomAction>
+
     <UIRef Id="WixUI_ErrorProgressText" />
 
     <Feature Id="chromoting_host" Level="1" Title="$(var.ChromotingHost)">
       <ComponentRef Id="omaha_registration"/>
       <ComponentRef Id="remoting_host"/>
       <ComponentRef Id="sas.dll"/>
       <ComponentRef Id="service_controller"/>
     </Feature>
 
+  <InstallExecuteSequence>
+    <Custom Action="query_auto_start_service" Before="InstallInitialize"/>
+    <Custom Action="set_auto_start_service" After="InstallFinalize">NOT INSTALLED AND (auto_start_service = "#2")</Custom>
+  </InstallExecuteSequence>
+
   </Product>
 </Wix>