Retrieve client_id from GoogleUpdateSettings when its missing from Local State.

chrome/chrome_installer_util.gypi

Index: chrome/chrome_installer_util.gypi
diff --git a/chrome/chrome_installer_util.gypi b/chrome/chrome_installer_util.gypi
index af05c2648ce80ca2996c1d23b2bd8e022fc5c05d..895b038419f79ff3d999225669bdbe74ee89dc4c 100644
--- a/chrome/chrome_installer_util.gypi
+++ b/chrome/chrome_installer_util.gypi
@@ -121,6 +121,7 @@
             '<(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',
@@ -189,6 +190,11 @@
             '<(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',