Remove PRODUCT_STRING_PATH from chrome_constants.h on Windows.

chrome/chrome_exe.gypi

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'targets': [
     {
       # GN version: //chrome
       'target_name': 'chrome',
       'type': 'none',
@@ skipping 80 matching lines @@
       },
       'conditions': [
         ['order_text_section!=""', {
           'target_conditions' : [
             ['_toolset=="target"', {
               'ldflags': [
                 '-Wl,-section-ordering-file=<(order_text_section)' ],
             }],
           ]
         }],
-        ['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,
         }],
         ['os_posix == 1 and OS != "mac" and OS != "android"', {
           'actions': [
             {
               'action_name': 'manpage',
               'conditions': [
                 [ 'branding == "Chrome"', {
@@ skipping 274 matching lines @@
           'dependencies': [
             '../sandbox/sandbox.gyp:sandbox',
           ],
         }],
         ['OS=="win"', {
           'dependencies': [
             'chrome_dll',
             'chrome_nacl_win64',
             'chrome_process_finder',
             'chrome_version_resources',
+            'chrome_watcher',
+            'chrome_watcher_client',
+            'file_pre_reader',
             'installer_util',
-            'file_pre_reader',
+            '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',
             '../win8/win8.gyp:visual_elements_resources',
           ],
           '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',
           ],
           'sources!': [
             # We still want the _win entry point for sandbox, etc.
             'app/chrome_exe_main_aura.cc',
           ],
           'msvs_settings': {
             'VCLinkerTool': {
               'OutputFile': '$(OutDir)\\initialexe\\chrome.exe',
               'DelayLoadDLLs': [
                 'dbghelp.dll',
                 'dwmapi.dll',
                 'uxtheme.dll',
                 'ole32.dll',
                 'oleaut32.dll',
               ],
               'conditions': [
                 ['win_console_app==0', {
                   # Set /SUBSYSTEM:WINDOWS for chrome.exe itself, unless a
                   # 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': {
               'AdditionalManifestFiles': [
                 '$(ProjectDir)\\app\\chrome.exe.manifest',
                 '<(SHARED_INTERMEDIATE_DIR)/chrome/app/version_assembly/version_assembly.manifest',
               ],
             },
           },
           'actions': [
@@ skipping 136 matching lines @@
               'dependencies': [
                 'chrome_nacl_win64',
               ],
             }],
           ],
         },
       ],
     }],
   ],
 }