Move options_util.* into chrome/browser/metrics.

chrome/chrome_browser.gypi

 # Copyright 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.
 
 {
   'variables': {
     # All .cc, .h, .m, and .mm files under browser except for:
     # * tests and mocks.
     # * code below browser/chromeos
     # * code below browser/extensions
@@ skipping 719 matching lines @@
       'browser/metrics/chrome_stability_metrics_provider.h',
       'browser/metrics/extensions_metrics_provider.cc',
       'browser/metrics/extensions_metrics_provider.h',
       'browser/metrics/field_trial_synchronizer.cc',
       'browser/metrics/field_trial_synchronizer.h',
       'browser/metrics/google_update_metrics_provider_win.cc',
       'browser/metrics/google_update_metrics_provider_win.h',
       'browser/metrics/gpu_metrics_provider.cc',
       'browser/metrics/gpu_metrics_provider.h',
       'browser/metrics/metric_event_duration_details.h',
+      'browser/metrics/metrics_reporting_state.cc',
+      'browser/metrics/metrics_reporting_state.h',
       'browser/metrics/metrics_service_accessor.cc',
       'browser/metrics/metrics_service_accessor.h',
       'browser/metrics/metrics_services_manager.cc',
       'browser/metrics/metrics_services_manager.h',
       'browser/metrics/network_metrics_provider.cc',
       'browser/metrics/network_metrics_provider.h',
       'browser/metrics/network_stats_uploader.cc',
       'browser/metrics/network_stats_uploader.h',
       'browser/metrics/omnibox_metrics_provider.cc',
       'browser/metrics/omnibox_metrics_provider.h',
@@ skipping 11 matching lines @@
       'browser/metrics/time_ticks_experiment_win.h',
       'browser/metrics/tracking_synchronizer.cc',
       'browser/metrics/tracking_synchronizer.h',
       'browser/metrics/tracking_synchronizer_observer.h',
       'browser/metrics/variations/generated_resources_map.h',
       'browser/metrics/variations/generated_resources_map_lookup.cc',
       'browser/metrics/variations/variations_registry_syncer_win.cc',
       'browser/metrics/variations/variations_registry_syncer_win.h',
       'browser/metrics/variations/variations_request_scheduler.cc',
       'browser/metrics/variations/variations_request_scheduler.h',
+      'browser/metrics/variations/variations_seed_store.cc',
+      'browser/metrics/variations/variations_seed_store.h',
       'browser/metrics/variations/variations_service.cc',
       'browser/metrics/variations/variations_service.h',
-      'browser/metrics/variations/variations_seed_store.cc',
-      'browser/metrics/variations/variations_seed_store.h',
       'browser/native_window_notification_source.h',
       'browser/net/about_protocol_handler.cc',
       'browser/net/about_protocol_handler.h',
       'browser/net/async_dns_field_trial.cc',
       'browser/net/async_dns_field_trial.h',
       'browser/net/chrome_cookie_notification_details.h',
       'browser/net/chrome_extensions_network_delegate.cc',
       'browser/net/chrome_extensions_network_delegate.h',
       'browser/net/chrome_fraudulent_certificate_reporter.cc',
       'browser/net/chrome_fraudulent_certificate_reporter.h',
@@ skipping 2832 matching lines @@
             'package_name': 'org/chromium/chrome/browser',
             'template_deps': ['browser/android/tab_load_status.h'],
           },
           'includes': [ '../build/android/java_cpp_template.gypi' ],
         },
       ],
      },
     ],
   ],
 }