Reverting r148671, r149866 (broke VS2008 builder) and r150361 (broke ninja).

remoting/remoting.gyp

Index: remoting/remoting.gyp
diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp
index fc8f68338cc56f84ce368bbb4f27b4be8b5547f6..a110dca273add3f9bdee1e2acd589e9659271593 100644
--- a/remoting/remoting.gyp
+++ b/remoting/remoting.gyp
@@ -118,12 +118,6 @@
           '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',
@@ -518,9 +512,6 @@
         {
           'target_name': 'remoting_elevated_controller',
           'type': 'static_library',
-          'defines' : [
-            'DAEMON_CONTROLLER_CLSID=<(daemon_controller_clsid)',
-          ],
           'sources': [
             'host/win/elevated_controller.idl',
             '<(SHARED_INTERMEDIATE_DIR)/remoting/host/elevated_controller.h',
@@ -549,7 +540,6 @@
             '_ATL_NO_AUTOMATIC_NAMESPACE',
             '_ATL_CSTRING_EXPLICIT_CONSTRUCTORS',
             'STRICT',
-            'DAEMON_CONTROLLER_CLSID="{<(daemon_controller_clsid)}"',
           ],
           'include_dirs': [
             '<(INTERMEDIATE_DIR)',
@@ -773,7 +763,6 @@
               '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).',