Move OmahaQueryParams to a component and add a delegate interface.

chrome/browser/omaha_query_params/chrome_omaha_query_params_delegate_unittest.cc

Index: chrome/browser/omaha_query_params/chrome_omaha_query_params_delegate_unittest.cc
diff --git a/chrome/browser/omaha_query_params/chrome_omaha_query_params_delegate_unittest.cc b/chrome/browser/omaha_query_params/chrome_omaha_query_params_delegate_unittest.cc
new file mode 100644
index 0000000000000000000000000000000000000000..f35375fff37c56ed650294aaf87c62b0374701d1
--- /dev/null
+++ b/chrome/browser/omaha_query_params/chrome_omaha_query_params_delegate_unittest.cc
@@ -0,0 +1,51 @@
+// Copyright 2014 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 "base/strings/stringprintf.h"
+#include "chrome/browser/omaha_query_params/chrome_omaha_query_params_delegate.h"
+#include "chrome/common/chrome_version_info.h"
+#include "components/omaha_query_params/omaha_query_params.h"
+#include "testing/gtest/include/gtest/gtest.h"
+
+using base::StringPrintf;
+
+namespace {
+
+bool Contains(const std::string& source, const std::string& target) {
+  return source.find(target) != std::string::npos;
+}
+
+}  // namespace
+
+void TestParams(omaha_query_params::OmahaQueryParams::ProdId prod_id) {
+  std::string params = omaha_query_params::OmahaQueryParams::Get(prod_id);
+
+  EXPECT_TRUE(Contains(
+      params,
+      StringPrintf("os=%s", omaha_query_params::OmahaQueryParams::GetOS())));
+  EXPECT_TRUE(
+      Contains(params,
+               StringPrintf("arch=%s",
+                            omaha_query_params::OmahaQueryParams::GetArch())));
+  EXPECT_TRUE(Contains(
+      params,
+      StringPrintf(
+          "prod=%s",
+          omaha_query_params::OmahaQueryParams::GetProdIdString(prod_id))));
+  EXPECT_TRUE(Contains(
+      params,
+      StringPrintf("prodchannel=%s",
+                   ChromeOmahaQueryParamsDelegate::GetChannelString())));
+  EXPECT_TRUE(Contains(
+      params,
+      StringPrintf("prodversion=%s", chrome::VersionInfo().Version().c_str())));
+  EXPECT_TRUE(Contains(
+      params,
+      StringPrintf("lang=%s", ChromeOmahaQueryParamsDelegate::GetLang())));
+}
+
+TEST(ChromeOmahaQueryParamsDelegateTest, GetParams) {
+  TestParams(omaha_query_params::OmahaQueryParams::CRX);
+  TestParams(omaha_query_params::OmahaQueryParams::CHROME);
+}