Retrieve client_id from GoogleUpdateSettings when its missing from Local State.

chrome/chrome_installer_util.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.
 
 {
   'target_defaults': {
     'variables': {
       'installer_util_target': 0,
     },
     'target_conditions': [
@@ skipping 103 matching lines @@
           'variables': {
             'installer_util_target': 1,
           },
           'dependencies': [
             'installer_util_strings',
             '<(DEPTH)/base/base.gyp:base',
             '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
             '<(DEPTH)/chrome/chrome_resources.gyp:chrome_resources',
             '<(DEPTH)/chrome/chrome_resources.gyp:chrome_strings',
             '<(DEPTH)/chrome/common_constants.gyp:common_constants',
+            '<(DEPTH)/components/components.gyp:metrics',
             '<(DEPTH)/courgette/courgette.gyp:courgette_lib',
             '<(DEPTH)/crypto/crypto.gyp:crypto',
             '<(DEPTH)/third_party/bspatch/bspatch.gyp:bspatch',
             '<(DEPTH)/third_party/icu/icu.gyp:icui18n',
             '<(DEPTH)/third_party/icu/icu.gyp:icuuc',
             '<(DEPTH)/third_party/lzma_sdk/lzma_sdk.gyp:lzma_sdk',
           ],
           'sources': [
             'installer/util/chrome_app_host_operations.cc',
             'installer/util/chrome_app_host_operations.h',
@@ skipping 48 matching lines @@
           'variables': {
             'installer_util_target': 1,
           },
           'dependencies': [
             'installer_util_strings',
           ],
           'include_dirs': [
             '<(SHARED_INTERMEDIATE_DIR)',
           ],
           'sources': [
+            # Include |client_info.cc| directly here to avoid having to create a

[grt (UTC plus 2), 2014/07/21 22:27:32]

hmm. i'm wondering if it's better to keep this hack alongside the others in the
chrome_nacl_win64 target of chrome_exe.gypi. are any of the other sources for
that target pulled for dependents of chrome_nacl_win64 rather than for the
target itself?

[gab, 2014/07/22 16:18:38]

Looking at the sources for chrome_nacl_win64 target, these all seem like direct
dependencies of the exe itself (e.g., breakpad); the chrome_initial target has
some of the same sources hardcoded.

In this case I think keeping client_info.cc as part of installer_util_nacl_win64
makes sense as it makes it clear what those are included for (otherwise it's
obscure what makes it such that chrome_nacl_win64 ends up needing those files).

+            # metrics_win64 target solely for this purpose...

[grt (UTC plus 2), 2014/07/22 16:47:12]

nit: ... -> .

[gab, 2014/07/22 19:09:40]

Done.

+            '../components/metrics/client_info.cc',
+            '../components/metrics/client_info.h',
+

[grt (UTC plus 2), 2014/07/22 16:47:11]

nit: remove newline

[gab, 2014/07/22 19:09:40]

Done.

             'installer/util/google_chrome_distribution_dummy.cc',
             'installer/util/master_preferences.h',
             'installer/util/master_preferences_dummy.cc',
           ],
           'configurations': {
             'Common_Base': {
               'msvs_target_platform': 'x64',
             },
           },
         },
@@ skipping 19 matching lines @@
           ],
           'include_dirs': [
             '<(DEPTH)',
           ],
         }
       ],
     }],
 
   ],
 }