RdpDesktopSession COM class should only use raw interfaces.

remoting/host/installer/win/chromoting.wxs

Index: remoting/host/installer/win/chromoting.wxs
diff --git a/remoting/host/installer/win/chromoting.wxs b/remoting/host/installer/win/chromoting.wxs
index fd0cbfd656e1af541cbea73ac7a196c902767eae..58a766cbe4eed8b5de6697a46f5a7c822e5d6c15 100644
--- a/remoting/host/installer/win/chromoting.wxs
+++ b/remoting/host/installer/win/chromoting.wxs
@@ -34,7 +34,11 @@
 
   <?define ControllerClass = "ElevatedController Class" ?>
   <?define ControllerProgid =
-    "ChromotingElevatedController.ElevatedController" ?>
+      "ChromotingElevatedController.ElevatedController" ?>
+
+  <?define IRdpDesktopSessionId = "{126c22bc-34ef-4cfb-83ef-9b8ada3391e8}" ?>
+  <?define IRdpDesktopSessionEventHandlerId =
+      "{987bca97-9d40-42fc-a00d-e6a701261af5}" ?>
 
   <!--
     The long hex values below are security descriptors generated from SDDL
@@ -363,23 +367,33 @@
                                Value="$(var.ChromotingTypelib)"/>
               </RegistryKey>
             </RegistryKey>
-          </RegistryKey>
 
-          <RegistryKey Key="Interface">
-            <!-- IRdpDesktopSession interface -->
-            <RegistryKey Key="{126c22bc-34ef-4cfb-83ef-9b8ada3391e8}"
+            <!-- IRdpDesktopSession PSFactory -->
+            <RegistryKey Key="$(var.IRdpDesktopSessionId)"
                          Action="create">
-              <RegistryKey Key="ProxyStubClsid32" Action="create">
+              <RegistryValue Type="string"
+                             Value="IRdpDesktopSession PSFactory"/>
+
+              <RegistryKey Key="InprocServer32" Action="create">
                 <RegistryValue Type="string"
-                               Value="{00020424-0000-0000-C000-000000000046}"/>
+                               Value="[binaries]$(var.CoreBinary)"/>
               </RegistryKey>
+            </RegistryKey>
 
-              <RegistryKey Key="TypeLib" Action="create">
+            <!-- IRdpDesktopSessionEventHandler PSFactory -->
+            <RegistryKey Key="$(var.IRdpDesktopSessionEventHandlerId)"
+                         Action="create">
+              <RegistryValue Type="string"
+                             Value="IRdpDesktopSessionEventHandler PSFactory"/>
+
+              <RegistryKey Key="InprocServer32" Action="create">
                 <RegistryValue Type="string"
-                               Value="$(var.ChromotingTypelib)"/>
+                               Value="[binaries]$(var.CoreBinary)"/>
               </RegistryKey>
             </RegistryKey>
+          </RegistryKey>
 
+          <RegistryKey Key="Interface">
             <!-- IDaemonControl2 interface -->
             <RegistryKey Key="{655bd819-c08c-4b04-80c2-f160739ff6ef}"
                          Action="create">
@@ -394,8 +408,8 @@
               </RegistryKey>
             </RegistryKey>
 
-            <!-- IRdpDesktopSessionEventHandler interface -->
-            <RegistryKey Key="{987bca97-9d40-42fc-a00d-e6a701261af5}"
+            <!-- IDaemonControl interface -->
+            <RegistryKey Key="{e051a481-6345-4ba1-bdb1-cf7929955268}"
                          Action="create">
               <RegistryKey Key="ProxyStubClsid32" Action="create">
                 <RegistryValue Type="string"
@@ -408,12 +422,25 @@
               </RegistryKey>
             </RegistryKey>
 
-            <!-- IDaemonControl interface -->
-            <RegistryKey Key="{e051a481-6345-4ba1-bdb1-cf7929955268}"
+            <!-- IRdpDesktopSession interface -->
+            <RegistryKey Key="$(var.IRdpDesktopSessionId)"
                          Action="create">
+              <RegistryValue Type="string"
+                             Value="IRdpDesktopSession"/>
               <RegistryKey Key="ProxyStubClsid32" Action="create">
                 <RegistryValue Type="string"
-                               Value="{00020424-0000-0000-C000-000000000046}"/>
+                               Value="$(var.IRdpDesktopSessionId)"/>
+              </RegistryKey>
+            </RegistryKey>
+
+            <!-- IRdpDesktopSessionEventHandler interface -->
+            <RegistryKey Key="$(var.IRdpDesktopSessionEventHandlerId)"
+                         Action="create">
+              <RegistryValue Type="string"
+                             Value="IRdpDesktopSessionEventHandler"/>
+              <RegistryKey Key="ProxyStubClsid32" Action="create">
+                <RegistryValue Type="string"
+                               Value="$(var.IRdpDesktopSessionEventHandlerId)"/>
               </RegistryKey>
 
               <RegistryKey Key="TypeLib" Action="create">