Remove PRODUCT_STRING_PATH from chrome_constants.h on Windows.

chrome/chrome_exe.gypi

Index: chrome/chrome_exe.gypi
diff --git a/chrome/chrome_exe.gypi b/chrome/chrome_exe.gypi
index 534f0c8df8c5abb57a241a77e80a6ced1931b468..2a3b03de0f6514e9160419ef4735ceaba5efcc4a 100644
--- a/chrome/chrome_exe.gypi
+++ b/chrome/chrome_exe.gypi
@@ -98,23 +98,6 @@
             }],
           ]
         }],
-        ['OS == "win"', {

[grt (UTC plus 2), 2016/04/15 15:29:32]

nice cleanup here!

[gab, 2016/04/15 18:14:07]

Ack :-)

-          'dependencies': [
-            'chrome_watcher',
-            'chrome_watcher_client',
-            '../components/components.gyp:browser_watcher_client',
-            '../components/components.gyp:crash_component',
-          ],
-          'sources': [
-            'app/chrome_crash_reporter_client.cc',
-            'app/chrome_crash_reporter_client.h',
-          ],
-          'conditions': [
-            ['win_console_app==1', {
-              'defines': ['WIN_CONSOLE_APP'],
-            }],
-          ],
-        }],
         ['OS == "android"', {
           # Don't put the 'chrome' target in 'all' on android
           'suppress_wildcard': 1,
@@ -409,18 +392,23 @@
             'chrome_nacl_win64',
             'chrome_process_finder',
             'chrome_version_resources',
-            'installer_util',
+            'chrome_watcher',
+            'chrome_watcher_client',
             'file_pre_reader',
+            'installer_util',
+            'metrics_constants_util_win',
             '../base/base.gyp:base',
-            '../crypto/crypto.gyp:crypto',
             '../breakpad/breakpad.gyp:breakpad_handler',
             '../breakpad/breakpad.gyp:breakpad_sender',
+            '../chrome/common_constants.gyp:common_constants',
             '../chrome_elf/chrome_elf.gyp:chrome_elf',
+            '../components/components.gyp:browser_watcher_client',
             '../components/components.gyp:crash_component',
             '../components/components.gyp:crash_core_common',
             '../components/components.gyp:flags_ui_switches',
             '../components/components.gyp:policy',
             '../components/components.gyp:startup_metric_utils_common',
+            '../crypto/crypto.gyp:crypto',
             '../sandbox/sandbox.gyp:sandbox',
             '../third_party/kasko/kasko.gyp:kasko_features',
             '../ui/gfx/gfx.gyp:gfx',
@@ -428,6 +416,8 @@
           ],
           'sources': [
             '<(SHARED_INTERMEDIATE_DIR)/chrome_version/chrome_exe_version.rc',
+            'app/chrome_crash_reporter_client.cc',
+            'app/chrome_crash_reporter_client.h',
             'app/chrome_exe.rc',
             'common/crash_keys.cc',
             'common/crash_keys.h',
@@ -452,6 +442,9 @@
                   # console build has been requested.
                   'SubSystem': '2',
                 }],
+                ['win_console_app==1', {

[grt (UTC plus 2), 2016/04/15 15:29:32]

pull this up and out of the msvs_settings block

[gab, 2016/04/15 18:14:07]

Done.

+                  'defines': ['WIN_CONSOLE_APP'],
+                }],
               ],
             },
             'VCManifestTool': {