Enable pairing registry in me2me native messaging host on Windows

remoting/remoting_host.gypi

Index: remoting/remoting_host.gypi
diff --git a/remoting/remoting_host.gypi b/remoting/remoting_host.gypi
index 8b865e70c5efdf49aa56d5277d08bfa6bb378106..a725e99459d92ec9b292971b866b563203ef9e26 100644
--- a/remoting/remoting_host.gypi
+++ b/remoting/remoting_host.gypi
@@ -555,6 +555,28 @@
           ],
         },  # end of target 'remoting_it2me_host_static'
         {
+          'target_name': 'remoting_me2me_native_messaging_host',
+          'type': 'executable',
+          'product_name': 'remoting_native_messaging_host',
+          'variables': { 'enable_wexit_time_destructors': 1, },
+          'dependencies': [
+            '../base/base.gyp:base',
+            'remoting_host',
+            'remoting_host_setup_base',
+            'remoting_native_messaging_base',
+          ],
+          'sources': [
+            'host/setup/me2me_native_messaging_host_main.cc',
+          ],
+          'conditions': [
+            ['OS=="linux" and linux_use_tcmalloc==1', {
+              'dependencies': [
+                '../base/allocator/allocator.gyp:allocator',
+              ],
+            }],
+          ],
+        },  # end of target 'remoting_me2me_native_messaging_host'
+        {
           'target_name': 'remoting_it2me_native_messaging_host',
           'type': 'executable',
           'variables': { 'enable_wexit_time_destructors': 1, },
@@ -608,7 +630,7 @@
           'conditions': [
             [ 'OS == "win"', {
               'variables': {
-                'me2me_host_path': 'remoting_host.exe',
+                'me2me_host_path': 'remoting_native_messaging_host.exe',
                 'it2me_host_path': 'remoting_assistance_host.exe',
               },
             }],
@@ -630,8 +652,8 @@
             }],
           ],  # conditions
           'sources': [
-            'host/it2me/com.google.chrome.remote_assistance.json.jinja2',
             'host/setup/com.google.chrome.remote_desktop.json.jinja2',

[Sergey Ulanov, 2014/02/13 01:53:24]

I believe the previous order was correct.

[weitao, 2014/02/13 18:13:09]

Done.

+            'host/it2me/com.google.chrome.remote_assistance.json.jinja2',
           ],
           'rules': [{
             'rule_name': 'generate_manifest',
@@ -787,28 +809,6 @@
             }],  # OS=linux
           ],  # end of 'conditions'
         },  # end of target 'remoting_me2me_host'
-        {
-          'target_name': 'remoting_me2me_native_messaging_host',
-          'type': 'executable',
-          'product_name': 'remoting_native_messaging_host',
-          'variables': { 'enable_wexit_time_destructors': 1, },
-          'dependencies': [
-            '../base/base.gyp:base',
-            'remoting_host',
-            'remoting_host_setup_base',
-            'remoting_native_messaging_base',
-          ],
-          'sources': [
-            'host/setup/me2me_native_messaging_host_main.cc',
-          ],
-          'conditions': [
-            ['OS=="linux" and linux_use_tcmalloc==1', {
-              'dependencies': [
-                '../base/allocator/allocator.gyp:allocator',
-              ],
-            }],
-          ],
-        },  # end of target 'remoting_me2me_native_messaging_host'
       ],  # end of 'targets'
     }],  # OS!="win"