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

chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc

Index: chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc
diff --git a/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc b/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc
index 901adc55354cef127256d4c98a8ddfb04ae21805..57315911cf3b4373bce5556fb98007fa99433dc0 100644
--- a/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc
+++ b/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc
@@ -9,7 +9,6 @@
 #include "base/base64.h"
 #include "base/logging.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/chrome_metrics_helper.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/download/download_request_limiter.h"
 #include "chrome/browser/download/download_resource_throttle.h"
@@ -17,6 +16,7 @@
 #include "chrome/browser/extensions/user_script_listener.h"
 #include "chrome/browser/external_protocol/external_protocol_handler.h"
 #include "chrome/browser/google/google_util.h"
+#include "chrome/browser/metrics/variations/variations_http_header_provider.h"
 #include "chrome/browser/net/load_timing_observer.h"
 #include "chrome/browser/net/resource_prefetch_predictor_observer.h"
 #include "chrome/browser/prerender/prerender_manager.h"
@@ -173,9 +173,11 @@ void ChromeResourceDispatcherHostDelegate::RequestBeginning(
     ProfileIOData* io_data = ProfileIOData::FromResourceContext(
         resource_context);
     bool incognito = io_data->is_incognito();
-    ChromeMetricsHelper::GetInstance()->AppendHeaders(
-        request->url(), incognito,
-        !incognito && io_data->GetMetricsEnabledStateOnIOThread(), &headers);
+    chrome_variations::VariationsHttpHeaderProvider::GetInstance()->
+        AppendHeaders(request->url(),
+                      incognito,
+                      !incognito && io_data->GetMetricsEnabledStateOnIOThread(),
+                      &headers);
     request->SetExtraRequestHeaders(headers);
   }