[Chromoting] Fix remoting_host_installation wix actions.

remoting/remoting.gyp

Index: remoting/remoting.gyp
diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp
index 53927b17a4bc363a73baea0b5bec96dc17d93049..31b435cf5f7c09248c87b7b15d75bb4ff5664d90 100644
--- a/remoting/remoting.gyp
+++ b/remoting/remoting.gyp
@@ -482,15 +482,14 @@
           'outputs': [
             '<(PRODUCT_DIR)/chromoting.msi',
           ],
+          'wix_defines' : [
+            '"-dBranding=<(branding)"',
+          ],
           'conditions': [
             ['buildtype == "Official"', {
-              'variables': {
-                 'official_build': '-dOfficialBuild=1',
-              },
-            }, { # else branding!="Chrome"
-              'variables': {
-                 'official_build': '',
-              },
+              'wix_defines': [
+                '-dOfficialBuild=1',
+              ],
             }],
           ],
           'rules': [
@@ -501,7 +500,7 @@
                 '<(PRODUCT_DIR)/remoting_host_controller.exe',
                 '<(PRODUCT_DIR)/remoting_me2me_host.exe',
                 '<(PRODUCT_DIR)/remoting_service.exe',
-                '<(platformsdk_path)/redist/x86/sas.dll'
+                '<(platformsdk_path)/redist/x86/sas.dll',
               ],
               'outputs': [
                 '<(INTERMEDIATE_DIR)/<(RULE_INPUT_ROOT).wixobj',
@@ -514,11 +513,10 @@
                 '-ext "<(wix_path)\\WixFirewallExtension.dll"',
                 '-ext "<(wix_path)\\WixUIExtension.dll"',
                 '-ext "<(wix_path)\\WixUtilExtension.dll"',
-                '-dVersion=<(version_full) '
-                '"-dFileSource=<(PRODUCT_DIR)." '
-                '"-dSasDllPath=<(platformsdk_path)/redist/x86/sas.dll" '
-                '<(official_build) '
-                '"-dBranding=<(branding)" '
+                '-dVersion=<(version_full)',
+                '"-dFileSource=<(PRODUCT_DIR)."',
+                '"-dSasDllPath=<(platformsdk_path)/redist/x86/sas.dll"',
+                '<@(_wix_defines)',
                 '-out <@(_outputs)',
                 '"<(RULE_INPUT_PATH)"',
               ],
@@ -531,7 +529,7 @@
                 '<(PRODUCT_DIR)/remoting_host_controller.exe',
                 '<(PRODUCT_DIR)/remoting_me2me_host.exe',
                 '<(PRODUCT_DIR)/remoting_service.exe',
-                '<(platformsdk_path)/redist/x86/sas.dll'
+                '<(platformsdk_path)/redist/x86/sas.dll',
               ],
               'outputs': [
                 '<(PRODUCT_DIR)/<(RULE_INPUT_ROOT).msi',
@@ -545,11 +543,10 @@
                 '-ext "<(wix_path)\\WixUIExtension.dll"',
                 '-ext "<(wix_path)\\WixUtilExtension.dll"',
                 '-cultures:en-us',
-                '-dVersion=<(version_full) '
-                '"-dFileSource=<(PRODUCT_DIR)." '
-                '"-dSasDllPath=<(platformsdk_path)/redist/x86/sas.dll" '
-                '<(official_build) '
-                '"-dBranding=<(branding)" '
+                '-dVersion=<(version_full)',
+                '"-dFileSource=<(PRODUCT_DIR)."',
+                '"-dSasDllPath=<(platformsdk_path)/redist/x86/sas.dll"',
+                '<@(_wix_defines)',
                 '-out "<(PRODUCT_DIR)/<(RULE_INPUT_ROOT).msi"',
                 '"<(RULE_INPUT_PATH)"',
               ],