Retrieve client_id from GoogleUpdateSettings when its missing from Local State.

components/metrics.gypi

 # Copyright 2014 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: //components/metrics
       'target_name': 'metrics',
       'type': 'static_library',
       'include_dirs': [
         '..',
       ],
       'dependencies': [
         '../base/base.gyp:base',
         '../third_party/zlib/zlib.gyp:zlib',
         'component_metrics_proto',
         'variations',
       ],
       'sources': [
+        'metrics/client_info.cc',
+        'metrics/client_info.h',
+        'metrics/cloned_install_detector.cc',
+        'metrics/cloned_install_detector.h',
         'metrics/compression_utils.cc',
         'metrics/compression_utils.h',
-        'metrics/cloned_install_detector.cc',
-        'metrics/cloned_install_detector.h',
         'metrics/machine_id_provider.h',
         'metrics/machine_id_provider_stub.cc',
         'metrics/machine_id_provider_win.cc',
         'metrics/metrics_hashes.cc',
         'metrics/metrics_hashes.h',
         'metrics/metrics_log.cc',
         'metrics/metrics_log.h',
+        'metrics/metrics_log_manager.cc',
+        'metrics/metrics_log_manager.h',
         'metrics/metrics_log_uploader.cc',
         'metrics/metrics_log_uploader.h',
-        'metrics/metrics_log_manager.cc',
-        'metrics/metrics_log_manager.h',
         'metrics/metrics_pref_names.cc',
         'metrics/metrics_pref_names.h',
         'metrics/metrics_provider.h',
         'metrics/metrics_reporting_scheduler.cc',
         'metrics/metrics_reporting_scheduler.h',
         'metrics/metrics_service.cc',
         'metrics/metrics_service.h',
         'metrics/metrics_service_client.h',
         'metrics/metrics_service_observer.cc',
         'metrics/metrics_service_observer.h',
@@ skipping 91 matching lines @@
             'metrics/chromeos/metric_sample.h',
           ],
           'dependencies': [
             '../base/base.gyp:base',
           ],
         },
       ],
     }],
   ],
 }