Revert 180433 because build\some.gyp was added to the CL by mistake.

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?>
 
   <?define FirewallName = "$(var.ChromotingHost)" ?>
 
   <?define OmahaAppid = "{b210701e-ffc4-49e3-932b-370728c72662}" ?>
   <?define UpgradeCode = "2b21f767-e157-4fa6-963c-55834c1433a6" ?>
 
-  <?define CoreBinary = "remoting_core.dll" ?>
-
   <?define ControllerAppid = "{4ff35d5e-d226-4550-9248-03e7779e67de}" ?>
   <?define ControllerBinary = "remoting_controller.exe" ?>
   <?define ControllerClass = "ElevatedController Class" ?>
   <?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
@@ skipping 93 matching lines @@
     </Directory>
 
     <DirectoryRef Id="binaries">
       <Component Id="sas" Guid="*">
         <File Id="sas.dll"
               DiskId="1"
               Name="sas.dll"
               Vital="yes"/>
       </Component>
 
-      <Component Id="remoting_core" Guid="*">
-        <File Id="$(var.CoreBinary)"
-              DiskId="1"
-              KeyPath="yes"
-              Name="$(var.CoreBinary)"
-              Vital="yes"/>
-
-        <util:EventSource xmlns:util="http://schemas.microsoft.com/wix/UtilExtension"
-                          Name="$(var.EventSourceName)"
-                          Log="Application"
-                          CategoryCount="1"
-                          CategoryMessageFile="[#$(var.CoreBinary)]"
-                          EventMessageFile="[#$(var.CoreBinary)]"
-                          SupportsErrors="yes"
-                          SupportsInformationals="yes"/>
-      </Component>
-
       <?if $(var.RemotingMultiProcess) != 0 ?>
         <Component Id="remoting_desktop" Guid="*">
           <File Id="remoting_desktop.exe"
                 DiskId="1"
                 KeyPath="yes"
                 Name="remoting_desktop.exe"
                 Vital="yes"/>
         </Component>
       <?endif?>
 
@@ skipping 21 matching lines @@
                         Remove="uninstall"
                         Name="$(var.ServiceName)"
                         Wait="yes" />
       </Component>
 
       <Component Id="remoting_host" Guid="*">
         <File Id="remoting_host.exe"
               DiskId="1"
               Name="remoting_host.exe"
               Vital="yes"/>
+        <util:EventSource xmlns:util="http://schemas.microsoft.com/wix/UtilExtension"
+                          Name="$(var.EventSourceName)"
+                          Log="Application"
+                          CategoryCount="1"
+                          CategoryMessageFile="[#remoting_host.exe]"
+                          EventMessageFile="[#remoting_host.exe]"
+                          SupportsErrors="yes"
+                          SupportsInformationals="yes"/>
+
         <fire:FirewallException xmlns:fire="http://schemas.microsoft.com/wix/FirewallExtension"
                                 Id="me2me_firewall_exception"
                                 IgnoreFailure="yes"
                                 Name="$(var.FirewallName)"
                                 Profile="all"
                                 Program="[#remoting_host.exe]"
                                 Scope="any" />
       </Component>
 
       <?if $(var.OfficialBuild) != 0 ?>
@@ skipping 67 matching lines @@
             <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="@[binaries]$(var.CoreBinary),-103"/>
+                             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).$(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)"/>
               </RegistryKey>
 
               <RegistryKey Key="Elevation" Action="create">
                 <RegistryValue Type="integer"
                                Name="Enabled"
                                Value="1"/>
                 <RegistryValue Type="string"
                                Name="IconReference"
-                               Value="@[binaries]$(var.CoreBinary),-104"/>
+                               Value="@[#$(var.ControllerBinary)],-101"/>
               </RegistryKey>
             </RegistryKey>
           </RegistryKey>
 
           <RegistryKey Key="Interface">
             <RegistryKey Key="{655bd819-c08c-4b04-80c2-f160739ff6ef}"
                          Action="create">
               <RegistryKey Key="ProxyStubClsid32" Action="create">
                 <RegistryValue Type="string"
                                Value="{00020424-0000-0000-C000-000000000046}"/>
@@ skipping 18 matching lines @@
               </RegistryKey>
             </RegistryKey>
           </RegistryKey>
 
           <RegistryKey Key="Typelib">
             <RegistryKey Key="$(var.ControllerTypelib)" Action="create">
               <RegistryKey Key="1.1" Action="create">
                 <RegistryKey Key="0" Action="create">
                   <RegistryKey Key="win32" Action="create">
                     <RegistryValue Type="string"
-                                   Value="@[binaries]$(var.CoreBinary)"/>
+                                   Value="[#$(var.ControllerBinary)]"/>
                   </RegistryKey>
                 </RegistryKey>
 
                 <RegistryKey Key="FLAGS" Action="create">
                   <RegistryValue Type="string"
                                  Value="0"/>
                 </RegistryKey>
 
                 <RegistryKey Key="HELPDIR" Action="create">
                   <RegistryValue Type="string"
@@ skipping 76 matching lines @@
                   Execute="deferred"
                   Script="jscript">
       <![CDATA[
         var controller = new ActiveXObject("$(var.ControllerProgid)");
         controller.StartDaemon();
       ]]>
     </CustomAction>
 
     <CustomAction Id="set_service_display_name"
                   Property="chromoting_service_display_name"
-                  Value="@[binaries]$(var.CoreBinary),-101" />
+                  Value="@[binaries]remoting_daemon.exe,-101" />
     <CustomAction Id="set_service_description"
                   Property="chromoting_service_description"
-                  Value="@[binaries]$(var.CoreBinary),-102" />
+                  Value="@[binaries]remoting_daemon.exe,-102" />
 
     <!-- XP does not support MUI strings in the service name and description, so
          we fall back to plain strings on XP. -->
     <CustomAction Id="set_service_display_name_xp"
                   Property="chromoting_service_display_name"
                   Value="$(var.ChromotingServiceName)" />
     <CustomAction Id="set_service_description_xp"
                   Property="chromoting_service_description"
                   Value="$(var.ChromotingServiceDescription)" />
 
     <UIRef Id="WixUI_ErrorProgressText" />
 
     <Feature Id="chromoting_host" Level="1" Title="$(var.ChromotingHost)">
       <ComponentRef Id="delete_debug_log"/>
       <ComponentRef Id="delete_usagestats"/>
       <?if $(var.OfficialBuild) != 0 ?>
         <ComponentRef Id="omaha_registration"/>
       <?endif?>
       <ComponentRef Id="remoting_controller"/>
-      <ComponentRef Id="remoting_core"/>
       <ComponentRef Id="remoting_daemon"/>
       <?if $(var.RemotingMultiProcess) != 0 ?>
         <ComponentRef Id="remoting_desktop"/>
       <?endif?>
       <ComponentRef Id="remoting_host"/>
       <ComponentRef Id="sas"/>
       <ComponentRef Id="sawbuck_provider"/>
     </Feature>
 
     <!-- Set the icon shown in Add/Remove Programs. -->
@@ skipping 19 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>