Remove PRODUCT_STRING_PATH from chrome_constants.h on Windows.

chrome/chrome_browser.gypi

 # Copyright 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.
 
 {
   'variables': {
     # All .cc, .h, .m, and .mm files under browser except for:
     # * tests and mocks.
     # * code below browser/chromeos
     # * code below browser/extensions
@@ skipping 3275 matching lines @@
         # crbug.com/422251
         '../build/android/disable_gcc_lto.gypi',
       ],
       'conditions': [
         ['OS != "ios"', {
           'dependencies': [
             'common_mojo_bindings',
             'common_net',
             'debugger',
             'installer_util',
+            'metrics_constants_util_win',
             '../cc/cc.gyp:cc',
             '../components/components.gyp:about_handler',
             '../components/components.gyp:autofill_content_browser',
             '../components/components.gyp:browsing_data',
             '../components/components.gyp:certificate_reporting',
             '../components/components.gyp:contextual_search_browser',
             '../components/components.gyp:cookie_config',
             '../components/components.gyp:data_reduction_proxy_content_browser',
             '../components/components.gyp:data_use_measurement_content',
             '../components/components.gyp:devtools_discovery',
             '../components/components.gyp:devtools_http_handler',
             '../components/components.gyp:dom_distiller_content_browser',
             '../components/components.gyp:domain_reliability',
             '../components/components.gyp:error_page_common',
             '../components/components.gyp:favicon_content',
             '../components/components.gyp:flags_ui',
             '../components/components.gyp:guest_view_browser',
             '../components/components.gyp:history_content_browser',
             '../components/components.gyp:keyed_service_content',
-            '../components/components.gyp:navigation_interception',
-            '../components/components.gyp:network_hints_common',
             '../components/components.gyp:metrics_gpu',
             '../components/components.gyp:metrics_profiler',
             '../components/components.gyp:metrics_profiler_content',
+            '../components/components.gyp:navigation_interception',
             '../components/components.gyp:net_log',
+            '../components/components.gyp:network_hints_common',
             '../components/components.gyp:ntp_snippets',
             '../components/components.gyp:packed_ct_ev_whitelist',
             '../components/components.gyp:password_manager_content_browser',
             '../components/components.gyp:password_manager_sync_browser',
             '../components/components.gyp:power',
             '../components/components.gyp:profile_metrics',
             '../components/components.gyp:proxy_config',
             '../components/components.gyp:renderer_context_menu',
             '../components/components.gyp:safe_browsing_db',
             '../components/components.gyp:safe_json',
             '../components/components.gyp:security_state',
             '../components/components.gyp:sessions_content',
+            '../components/components.gyp:ssl_config',
             '../components/components.gyp:storage_monitor',
-            '../components/components.gyp:ssl_config',
             '../components/components.gyp:syncable_prefs',
             '../components/components.gyp:translate_content_browser',
             '../components/components.gyp:upload_list',
             '../components/components.gyp:url_matcher',
             '../components/components.gyp:user_prefs_tracked',
             '../components/components.gyp:visitedlink_browser',
             '../components/components.gyp:visitedlink_common',
             '../components/components.gyp:wallpaper',
             '../components/components.gyp:web_cache_browser',
             '../components/components.gyp:web_resource',
@@ skipping 13 matching lines @@
             '../mojo/mojo_base.gyp:mojo_url_type_converters',
             '../mojo/mojo_edk.gyp:mojo_system_impl',
             '../mojo/mojo_public.gyp:mojo_cpp_bindings',
             '../mojo/mojo_public.gyp:mojo_js_bindings',
             '../mojo/mojo_public.gyp:mojo_message_pump_lib',
             '../net/net.gyp:net_extras',
             '../net/net.gyp:net_with_v8',
             '../services/shell/shell.gyp:shell_public',
             '../storage/storage_browser.gyp:storage',
             '../storage/storage_common.gyp:storage_common',
-            '../third_party/re2/re2.gyp:re2',
             '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
             '../third_party/libaddressinput/libaddressinput.gyp:libaddressinput',
             '../third_party/libyuv/libyuv.gyp:libyuv',
+            '../third_party/re2/re2.gyp:re2',
             '../third_party/smhasher/smhasher.gyp:cityhash',
             '../third_party/webrtc/modules/modules.gyp:desktop_capture',
             '../ui/base/ime/ui_base_ime.gyp:ui_base_ime',
             '../ui/gl/gl.gyp:gl',
             '../ui/surface/surface.gyp:surface',
             '../ui/web_dialogs/web_dialogs.gyp:web_dialogs',
             '../v8/tools/gyp/v8.gyp:v8',
           ],
           'sources': [
             '<@(chrome_browser_non_ios_sources)',
@@ skipping 76 matching lines @@
         }],
         ['OS=="mac"', {
           'dependencies': [
             'app_shim',
             'browser_app_shim',
           ],
           'sources': [ '<@(chrome_browser_mac_sources)' ]
         }],
         ['OS=="win"', {
           'dependencies': [
             'file_pre_reader',

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

how about putting the metrics_constants_util_win dependency down here?

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

Replied below.

           ],
         }],
         ['OS=="mac" or OS=="android"', {
           'sources': [
             '<@(chrome_browser_password_manager_mac_android_sources)',
           ],
         }],
         ['chromeos==1', {
           'sources!': [
             'browser/signin/chrome_signin_status_metrics_provider_delegate.cc',
@@ skipping 350 matching lines @@
         # Temporary fix to break the browser target into smaller chunks so it
         # will link with goma builds.
         ['OS=="win" and chromium_win_pch==0', {
           'msvs_shard': 4,
         }],
         ['OS=="win"', {
           'sources': [ '<@(chrome_browser_win_sources)' ],
           'include_dirs': [
             '<(DEPTH)/third_party/wtl/include',
           ],
           'dependencies': [

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

ignore previous comment. don't the metrics_constants_util_win and
file_pre_reader dependencies really belong here?

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

No, I put the dependency in the same target that includes the
"chrome_browser_metrics_sources" (which include
chrome/browser/metrics/(chrome_metrics_service_client|chrome_stability_metrics_provider).cc)
as this is why this dependency is required in the first place.

The rule I've been following is
add-dependency-to-all-targets-that-include-cc-files-that-depend-on-it which
makes this one land in the != ios block.

I think this is correct even if the _win rules only subtract files not
dependencies. Worst case it means including an empty target on other platforms.
Another option is to define the metrics_constants_util_win target in a win-only
condition, but then we can only use it from win-only blocks and end up with more
ifs (i.e. exactly what auto _win.cc subtraction is meant to avoid).

EDIT: (left old text for context but changed my mind...) Okay I can now see why
we'd want all of this in a win-only section, but I still find it weird to have
the dependencies and sources split.

Done.

             'chrome_process_finder',
             'chrome_watcher_client',
             'installer_util_strings',
             'kasko_util',
             '../chrome/common_constants.gyp:version_header',
             '../chrome_elf/chrome_elf.gyp:chrome_elf',
             '../chrome_elf/chrome_elf.gyp:chrome_elf_constants',
             '../chrome_elf/chrome_elf.gyp:dll_hash',
             '../components/components.gyp:browser_watcher',
             '../components/components.gyp:browser_watcher_client',
@@ skipping 373 matching lines @@
             '../components/components.gyp:rlz',
             '../components/components.gyp:search_engines',
             '../rlz/rlz.gyp:rlz_lib',
             'common',
           ],
         },
       ],
     }],
   ],
 }