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

remoting/remoting.gyp

Index: remoting/remoting.gyp
diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp
index e349ffa347a978d9c6874c2be277675c400210a3..6bda73800e21d05c873ee891272923dd06710425 100644
--- a/remoting/remoting.gyp
+++ b/remoting/remoting.gyp
@@ -118,6 +118,12 @@
           'webapp/_locales/en/messages.json',
         ],
       }],
+      ['OS=="win"', {
+        # Use auto-generated CLSID for the daemon controller to make sure that
+        # the newly installed version of the controller will be used during
+        # upgrade even if there is an old instance running already.
+        'daemon_controller_clsid': '<!(python tools/uuidgen.py)',
+      }],
     ],
     'remoting_webapp_files': [
       'resources/chromoting16.png',
@@ -513,7 +519,7 @@
           'target_name': 'remoting_elevated_controller',
           'type': 'static_library',
           'sources': [
-            'host/win/elevated_controller.idl',
+            'host/win/elevated_controller_idl.templ',
             '<(SHARED_INTERMEDIATE_DIR)/remoting/host/elevated_controller.h',
             '<(SHARED_INTERMEDIATE_DIR)/remoting/host/elevated_controller_i.c',
           ],
@@ -530,7 +536,26 @@
               '<(SHARED_INTERMEDIATE_DIR)',
             ],
           },
+          'rules': [
+            {
+              'rule_name': 'generate_idl',
+              'extension': 'templ',
+              'outputs': [
+                '<(SHARED_INTERMEDIATE_DIR)/remoting/host/<(RULE_INPUT_PATH).idl',
+              ],
+              'action': [
+                'python',
+                '<(version_py_path)',
+                '-e', 'DAEMON_CONTROLLER_CLSID="<(daemon_controller_clsid)"',
+                '<(RULE_INPUT_PATH)',
+                '<@(_outputs)',
+              ],
+              'process_outputs_as_sources': 1,
+              'message': 'Generating <@(_outputs)'
+            },
+          ],
         },  # end of target 'remoting_elevated_controller'
+

[Jamie, 2012/08/16 18:18:47]

Nit: We don't tend to have many blank lines in gyp files.

[alexeypa (please no reviews), 2012/08/16 18:35:59]

OK, but our gyp files tend to be unreadable too.

         {
           'target_name': 'remoting_host_controller',
           'type': 'executable',
@@ -540,6 +565,7 @@
             '_ATL_NO_AUTOMATIC_NAMESPACE',
             '_ATL_CSTRING_EXPLICIT_CONSTRUCTORS',
             'STRICT',
+            'DAEMON_CONTROLLER_CLSID="{<(daemon_controller_clsid)}"',
           ],
           'include_dirs': [
             '<(INTERMEDIATE_DIR)',
@@ -585,6 +611,7 @@
             },
           },
         },  # end of target 'remoting_host_controller'
+

[Jamie, 2012/08/16 18:18:47]

Nit: Blank line.

[alexeypa (please no reviews), 2012/08/16 18:35:59]

Done.

         {
           'target_name': 'remoting_service',
           'type': 'executable',
@@ -765,6 +792,7 @@
               'action': [
                 'python', 'tools/candle_and_light.py',
                 '--wix_path', '<(wix_path)',
+                '--controller_clsid', '{<(daemon_controller_clsid)}',
                 '--version', '<(version_full)',
                 '--product_dir', '<(PRODUCT_DIR).',
                 '--intermediate_dir', '<(INTERMEDIATE_DIR).',