Merge 94322 - Rewire the metrics pref to the signed settings store on chromeos.

chrome/chrome_browser.gypi

 # Copyright (c) 2011 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': [
     {
       'target_name': 'browser',
       'type': 'static_library',
       'dependencies': [
@@ skipping 623 matching lines @@
         'browser/chromeos/login/wizard_accessibility_helper.cc',
         'browser/chromeos/login/wizard_accessibility_helper.h',
         'browser/chromeos/login/wizard_controller.cc',
         'browser/chromeos/login/wizard_controller.h',
         'browser/chromeos/login/wizard_screen.cc',
         'browser/chromeos/login/wizard_screen.h',
         'browser/chromeos/low_battery_observer.cc',
         'browser/chromeos/low_battery_observer.h',
         'browser/chromeos/media/media_player.cc',
         'browser/chromeos/media/media_player.h',
-        'browser/chromeos/metrics_cros_settings_provider.cc',
-        'browser/chromeos/metrics_cros_settings_provider.h',
         'browser/chromeos/native_dialog_window.cc',
         'browser/chromeos/native_dialog_window.h',
         'browser/chromeos/net/cros_network_change_notifier_factory.cc',
         'browser/chromeos/net/cros_network_change_notifier_factory.h',
         'browser/chromeos/net/network_change_notifier_chromeos.cc',
         'browser/chromeos/net/network_change_notifier_chromeos.h',
         'browser/chromeos/network_login_observer.cc',
         'browser/chromeos/network_login_observer.h',
         'browser/chromeos/network_message_observer.cc',
         'browser/chromeos/network_message_observer.h',
@@ skipping 4205 matching lines @@
       ],
       'export_dependent_settings': [
         'in_memory_url_index_cache_proto',
       ],
       # This target exports a hard dependency because it includes generated
       # header files.
       'hard_dependency': 1,
     },
   ],
 }