Refactor VariationsHttpHeaderProvider.

components/feedback/feedback_uploader_chrome_unittest.cc

 // Copyright 2015 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 "components/feedback/feedback_uploader_chrome.h"
 
+#include <string>
+
 #include "base/message_loop/message_loop.h"
 #include "base/metrics/field_trial.h"
-#include "components/variations/net/variations_http_header_provider.h"
 #include "components/variations/variations_associated_data.h"
+#include "components/variations/variations_http_header_provider.h"
 #include "content/public/test/test_browser_context.h"
 #include "net/url_request/test_url_fetcher_factory.h"
 #include "net/url_request/url_fetcher_delegate.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace feedback {
 
 class FeedbackUploaderChromeTest : public ::testing::Test {
  protected:
   FeedbackUploaderChromeTest() {}
@@ skipping 40 matching lines @@
   std::string value;
   EXPECT_TRUE(headers.GetHeader("X-Client-Data", &value));
   EXPECT_FALSE(value.empty());
   // The fetcher's delegate is responsible for freeing the fetcher (and itself).
   fetcher->delegate()->OnURLFetchComplete(fetcher);
 
   variations::VariationsHttpHeaderProvider::GetInstance()->ResetForTesting();
 }
 
 }  // namespace feedback