Refactor VariationsHttpHeaderProvider.

chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc

 // Copyright (c) 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.
 
 #include "chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.h"
 
 #include <string>
 #include <vector>
 
 #include "base/base64.h"
@@ skipping 19 matching lines @@
 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
 #include "chrome/browser/signin/chrome_signin_helper.h"
 #include "chrome/browser/tab_contents/tab_util.h"
 #include "chrome/browser/ui/login/login_prompt.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/features.h"
 #include "chrome/common/url_constants.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_io_data.h"
 #include "components/google/core/browser/google_util.h"
-#include "components/variations/net/variations_http_header_provider.h"
+#include "components/variations/net/variations_http_headers.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/plugin_service.h"
 #include "content/public/browser/plugin_service_filter.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/resource_context.h"
 #include "content/public/browser/resource_dispatcher_host.h"
 #include "content/public/browser/resource_request_info.h"
 #include "content/public/browser/service_worker_context.h"
@@ skipping 227 matching lines @@
 }  // namespace
 
 ChromeResourceDispatcherHostDelegate::ChromeResourceDispatcherHostDelegate()
     : download_request_limiter_(g_browser_process->download_request_limiter()),
       safe_browsing_(g_browser_process->safe_browsing_service())
 #if defined(ENABLE_EXTENSIONS)
       , user_script_listener_(new extensions::UserScriptListener())
 #endif
       {
   BrowserThread::PostTask(
-      BrowserThread::IO,
-      FROM_HERE,
+      BrowserThread::IO, FROM_HERE,
       base::Bind(content::ServiceWorkerContext::AddExcludedHeadersForFetchEvent,
-                 variations::VariationsHttpHeaderProvider::GetInstance()
-                     ->GetVariationHeaderNames()));
+                 variations::GetVariationHeaderNames()));
 }
 
 ChromeResourceDispatcherHostDelegate::~ChromeResourceDispatcherHostDelegate() {
 #if defined(ENABLE_EXTENSIONS)
   CHECK(stream_target_info_.empty());
 #endif
 }
 
 bool ChromeResourceDispatcherHostDelegate::ShouldBeginRequest(
     const std::string& method,
@@ skipping 61 matching lines @@
   }
 #endif
 
   // Don't attempt to append headers to requests that have already started.
   // TODO(stevet): Remove this once the request ordering issues are resolved
   // in crbug.com/128048.
   if (!request->is_pending()) {
     net::HttpRequestHeaders headers;
     headers.CopyFrom(request->extra_request_headers());
     bool is_off_the_record = io_data->IsOffTheRecord();
-    variations::VariationsHttpHeaderProvider::GetInstance()->
-        AppendHeaders(request->url(),
-                      is_off_the_record,
-                      !is_off_the_record &&
-                          io_data->GetMetricsEnabledStateOnIOThread(),
-                      &headers);
+    variations::AppendVariationHeaders(
+        request->url(), is_off_the_record,
+        !is_off_the_record && io_data->GetMetricsEnabledStateOnIOThread(),
+        &headers);
     request->SetExtraRequestHeaders(headers);
   }
 
 #if defined(ENABLE_CONFIGURATION_POLICY)
   if (io_data->policy_header_helper())
     io_data->policy_header_helper()->AddPolicyHeaders(request->url(), request);
 #endif
 
   signin::AppendMirrorRequestHeaderHelper(request, GURL() /* redirect_url */,
                                           io_data, info->GetChildID(),
@@ skipping 353 matching lines @@
     return data_reduction_proxy_io_data->ShouldEnableLoFiMode(url_request);
   return false;
 }
 
 // static
 void ChromeResourceDispatcherHostDelegate::
     SetExternalProtocolHandlerDelegateForTesting(
     ExternalProtocolHandler::Delegate* delegate) {
   g_external_protocol_handler_delegate = delegate;
 }