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..a575c485f354f8ce90736c35318fe3b9e0762510 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',
@@ -184,6 +185,7 @@
           },
           'dependencies': [
             'installer_util_strings',
+            '<(DEPTH)/components/components.gyp:metrics',

[gab, 2014/07/16 20:36:54]

This dependency causes link errors between x86 vs x64 targets on Windows:

metrics.lib(metrics.persisted_logs.obj) : fatalerror LNK1112: module machine
type 'X86' conflicts with target machine type 'x64'

I don't really understand why (persistent_logs.cc uses base/base64.h...?!)...

The only solution I can think of is to introduce the metrics_common target as I
originally was going to do (which would only contain client_info.[cc|h] for
now).

WDYT?

[Ilya Sherman, 2014/07/16 20:40:42]

Justin, could you help us understand this error message in the 64-bit Windows
build?  (FWIW, I'm pretty sure base/base64.h is irrelevant.)

[jschuh, 2014/07/16 23:40:19]

I'm stumped. The error message means that you're grabbing a 32-bit lib in the
64-bit build. It doesn't look like you're building the 32-bit target, so maybe
you're not building the 64-bit target and end up picking up a 32-bit default?

[grt (UTC plus 2), 2014/07/18 01:14:49]

is this dependency even needed? installer_util_nacl_win64 doesn't build the
sources that would need the metrics component, does it
(google_update_settings.{cc,h})? what happens if you remove this line?

[gab, 2014/07/18 02:41:06]

It does, google_update_settings.cc is in target_defaults (i.e. all targets in
this file..)

           ],
           'include_dirs': [
             '<(SHARED_INTERMEDIATE_DIR)',