Cleanup: merging three different constants.h into a single header.

remoting/remoting.gyp

Index: remoting/remoting.gyp
diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp
index 39c9f67223223c71151d9871d896cefb498e1b33..6f5b2506160e0e4ac0e788c4792f8042e54f006e 100644
--- a/remoting/remoting.gyp
+++ b/remoting/remoting.gyp
@@ -9,7 +9,7 @@
     'chromium_code': 1,
     # Use consistent strings across all platforms. Note that the plugin name
     # is brand-dependent and is defined further down.
-    # Must match host/plugin/constants.h
+    # Must match base/constants.h
     'host_plugin_mime_type': 'application/vnd.chromium.remoting-host',
     'host_plugin_description': 'Allow another user to access your computer securely over the Internet.',
 
@@ -61,7 +61,7 @@
         'host_plugin_prefix': '',
       }],
       ['branding=="Chrome"', {
-        # Must match host/plugin/constants.h
+        # Must match base/constants.h
         'host_plugin_name': 'Chrome Remote Desktop Host',
         'remoting_webapp_locale_files': [
           'webapp/_locales.official/ar/messages.json',
@@ -108,7 +108,7 @@
           'webapp/_locales.official/zh_TW/messages.json',
         ],
       }, {  # else: branding!="Chrome"
-        # Must match host/plugin/constants.h
+        # Must match base/constants.h
         'host_plugin_name': 'Chromoting Host',
         'remoting_webapp_locale_files': [
           'webapp/_locales/en/messages.json',
@@ -509,6 +509,7 @@
           ],
           'dependencies': [
             '../base/base.gyp:base',
+            'remoting_base',

[simonmorris, 2012/06/18 20:30:12]

Is this necessary?

[alexeypa (please no reviews), 2012/06/18 20:34:02]

Yes. It needs values from constants.cc.

             'remoting_breakpad',
             'remoting_elevated_controller',
             'remoting_protocol',
@@ -557,6 +558,7 @@
             '../base/base.gyp:base_static',
             '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
             '../ipc/ipc.gyp:ipc',
+            'remoting_base',
             'remoting_breakpad',
             'remoting_version_resources',
           ],
@@ -566,8 +568,6 @@
             'host/branding.h',
             'host/chromoting_messages.cc',
             'host/chromoting_messages.h',
-            'host/constants.h',
-            'host/constants_win.cc',
             'host/host_service.rc',
             'host/host_service_resource.h',
             'host/host_service_win.cc',
@@ -795,8 +795,6 @@
         'base/breakpad_linux.cc',
         'base/breakpad_mac.mm',
         'base/breakpad_win.cc',
-        'host/constants.h',
-        'host/constants_win.cc',
       ],
       'conditions': [
         ['OS=="win"', {
@@ -1119,8 +1117,6 @@
         'host/clipboard_linux.cc',
         'host/clipboard_mac.mm',
         'host/clipboard_win.cc',
-        'host/constants.h',
-        'host/constants_win.cc',
         'host/continue_window.h',
         'host/continue_window_gtk.cc',
         'host/continue_window_mac.mm',