Fix variation id transmission with feedback reports.

components/feedback/feedback_uploader_chrome_unittest.cc

Index: components/feedback/feedback_uploader_chrome_unittest.cc
diff --git a/components/feedback/feedback_uploader_chrome_unittest.cc b/components/feedback/feedback_uploader_chrome_unittest.cc
new file mode 100644
index 0000000000000000000000000000000000000000..58ba226b4a1956153a31b581ebef17f31dd4aea6
--- /dev/null
+++ b/components/feedback/feedback_uploader_chrome_unittest.cc
@@ -0,0 +1,65 @@
+// 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 "base/message_loop/message_loop.h"
+#include "base/metrics/field_trial.h"
+#include "components/variations/variations_associated_data.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() {}
+
+  ~FeedbackUploaderChromeTest() override {
+    // Clean up registered ids.
+    variations::testing::ClearAllVariationIDs();
+  }
+
+  // Registers a field trial with the specified name and group and an associated
+  // google web property variation id.
+  void CreateFieldTrialWithId(const std::string& trial_name,
+                              const std::string& group_name,
+                              int variation_id) {
+    variations::AssociateGoogleVariationID(
+        variations::GOOGLE_WEB_PROPERTIES, trial_name, group_name,
+        static_cast<variations::VariationID>(variation_id));
+    base::FieldTrialList::CreateFieldTrial(trial_name, group_name)->group();
+  }
+
+ private:
+  base::MessageLoopForUI message_loop_;
+
+  DISALLOW_COPY_AND_ASSIGN(FeedbackUploaderChromeTest);
+};
+
+TEST_F(FeedbackUploaderChromeTest, VariationHeaders) {
+  // Register a trial and variation id, so that there is data in variations
+  // headers.
+  base::FieldTrialList field_trial_list_(NULL);
+  CreateFieldTrialWithId("Test", "Group1", 123);
+
+  content::TestBrowserContext context;
+  FeedbackUploaderChrome uploader(&context);
+
+  net::TestURLFetcherFactory factory;
+  uploader.DispatchReport("test");
+
+  net::TestURLFetcher* fetcher = factory.GetFetcherByID(0);
+  net::HttpRequestHeaders headers;
+  fetcher->GetExtraRequestHeaders(&headers);
+  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);
+}
+
+}  // namespace feedback