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

- Install the host binaries to versioned folders.
- Drop references to the COM objects quickly.
- Auto-generate CLSID of the daemon controller at GYP time. This makes sure that a freshly installed version of the controller will be launched after upgrade even if there is already running instance cached by RPCSS.

This CL restores https://chromiumcodereview.appspot.com/10831037 (r148671) and https://chromiumcodereview.appspot.com/10837087 (r149866) previously reverted by r150494. Unlike the previous two CLs this one does not require GYP changes (that is changes to GYP itself, not .gyp files).

BUG=137755


Review URL: https://chromiumcodereview.appspot.com/10828352

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152120 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 19 insertions, 10 deletions

diff --git a/remoting/host/win/chromoting.wxs b/remoting/host/win/chromoting.wxs
index 57f8789..bf8170f 100644
--- a/remoting/host/win/chromoting.wxs
+++ b/remoting/host/win/chromoting.wxs
@@ -26,7 +26,6 @@
   <?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}" ?>
@@ -44,6 +43,10 @@
   -->
   <?define ControllerSd = "010004805C0000006C00000000000000140000000200480003000000000014000300000001010000000000050400000000001400030000000101000000000005120000000000180003000000010200000000000520000000200200000102000000000005200000002002000001020000000000052000000020020000" ?>
 
+  <?ifndef ControllerClsid ?>
+    <?error ControllerClsid must be defined ?>
+  <?endif?>
+
   <?ifndef FileSource ?>
     <?error FileSource must be defined ?>
   <?endif?>
@@ -90,10 +93,14 @@
       <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">
@@ -217,11 +224,12 @@
 
             <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)"/>
 
@@ -251,7 +259,7 @@
 
               <RegistryKey Key="ProgID" Action="create">
                 <RegistryValue Type="string"
-                               Value="$(var.ControllerProgid).1"/>
+                               Value="$(var.ControllerProgid).$(var.Version)"/>
               </RegistryKey>
 
               <RegistryKey Key="TypeLib" Action="create">
diff --git a/remoting/host/win/elevated_controller.h b/remoting/host/win/elevated_controller.h
index dc33e1e..23bd3a5 100644
--- a/remoting/host/win/elevated_controller.h
+++ b/remoting/host/win/elevated_controller.h
@@ -16,9 +16,10 @@
 
 namespace remoting {
 
-class ATL_NO_VTABLE ElevatedController
+class ATL_NO_VTABLE __declspec(uuid(DAEMON_CONTROLLER_CLSID)) ElevatedController
     : public ATL::CComObjectRootEx<ATL::CComSingleThreadModel>,
-      public ATL::CComCoClass<ElevatedController, &CLSID_ElevatedController>,
+      public ATL::CComCoClass<ElevatedController,
+                              &__uuidof(ElevatedController)>,
       public ATL::IDispatchImpl<IDaemonControl2, &IID_IDaemonControl2,
                                 &LIBID_ChromotingElevatedControllerLib, 1, 1> {
  public:
@@ -57,7 +58,7 @@ class ATL_NO_VTABLE ElevatedController
   DECLARE_PROTECT_FINAL_CONSTRUCT()
 };
 
-OBJECT_ENTRY_AUTO(CLSID_ElevatedController, ElevatedController)
+OBJECT_ENTRY_AUTO(__uuidof(ElevatedController), ElevatedController)
 
 } // namespace remoting
 
diff --git a/remoting/host/win/elevated_controller.idl b/remoting/host/win/elevated_controller_idl.templ
index 590b8dd..27b15ae 100644
--- a/remoting/host/win/elevated_controller.idl
+++ b/remoting/host/win/elevated_controller_idl.templ
@@ -73,7 +73,7 @@ library ChromotingElevatedControllerLib {
   importlib("stdole2.tlb");
 
   [
-    uuid(430a9403-8176-4733-afdc-0b325a8fda84),
+    uuid(@DAEMON_CONTROLLER_CLSID@),
     helpstring("ElevatedController Class")
   ]
   coclass ElevatedController {