Move the Chrome Variations HTTP header helper file into c/b/metrics/variations, and fix up lock beh…

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.
 
 {
   'targets': [
     {
       'target_name': 'browser',
       'type': 'static_library',
       'variables': { 'enable_wexit_time_destructors': 1, },
@@ skipping 412 matching lines @@
         'browser/chrome_browser_main_mac.h',
         'browser/chrome_browser_main_mac.mm',
         'browser/chrome_browser_main_posix.cc',
         'browser/chrome_browser_main_posix.h',
         'browser/chrome_browser_main_win.cc',
         'browser/chrome_browser_main_win.h',
         'browser/chrome_browser_main_x11.cc',
         'browser/chrome_browser_main_x11.h',
         'browser/chrome_content_browser_client.cc',
         'browser/chrome_content_browser_client.h',
-        'browser/chrome_metrics_helper.cc',
-        'browser/chrome_metrics_helper.h',
         'browser/chrome_page_zoom.cc',
         'browser/chrome_page_zoom.h',
         'browser/chrome_page_zoom_constants.cc',
         'browser/chrome_page_zoom_constants.h',
         'browser/chrome_quota_permission_context.cc',
         'browser/chrome_quota_permission_context.h',
         'browser/chrome_to_mobile_service.cc',
         'browser/chrome_to_mobile_service.h',
         'browser/chrome_to_mobile_service_factory.cc',
         'browser/chrome_to_mobile_service_factory.h',
@@ skipping 623 matching lines @@
         'browser/metrics/metrics_reporting_scheduler.h',
         'browser/metrics/metrics_service.cc',
         'browser/metrics/metrics_service.h',
         'browser/metrics/thread_watcher.cc',
         'browser/metrics/thread_watcher.h',
         'browser/metrics/tracking_synchronizer.cc',
         'browser/metrics/tracking_synchronizer.h',
         'browser/metrics/tracking_synchronizer_observer.h',
         'browser/metrics/variations/resource_request_allowed_notifier.cc',
         'browser/metrics/variations/resource_request_allowed_notifier.h',
+        'browser/metrics/variations/variations_http_header_provider.cc',
+        'browser/metrics/variations/variations_http_header_provider.h',
         'browser/metrics/variations/variations_service.cc',
         'browser/metrics/variations/variations_service.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/basic_http_user_agent_settings.cc',
         'browser/net/basic_http_user_agent_settings.h',
         'browser/net/chrome_cookie_notification_details.h',
@@ skipping 2027 matching lines @@
           'variables': {
             'jni_gen_dir': 'chrome',
           },
           'includes': [ '../build/jni_generator.gypi' ],
         },
       ],
      },
     ],
   ],
 }