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/omaha_query_params_unittest.cc b/chrome/browser/omaha_query_params/chrome_omaha_query_params_delegate_unittest.cc
similarity index 66%
copy from chrome/browser/omaha_query_params/omaha_query_params_unittest.cc
copy to chrome/browser/omaha_query_params/chrome_omaha_query_params_delegate_unittest.cc
index e8a736aea300f7aabd1d7b11b1b791037f0b6c58..6d62af02235004b2f52aef6fc0d844d94c52707b 100644
--- a/chrome/browser/omaha_query_params/omaha_query_params_unittest.cc
+++ b/chrome/browser/omaha_query_params/chrome_omaha_query_params_delegate_unittest.cc
@@ -2,27 +2,25 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/omaha_query_params/omaha_query_params.h"
-
 #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 chrome {
+namespace {
 
 bool Contains(const std::string& source, const std::string& target) {
   return source.find(target) != std::string::npos;
 }
 
+}  // namespace
+
 void TestParams(OmahaQueryParams::ProdId prod_id) {
   std::string params = OmahaQueryParams::Get(prod_id);
 
-  // This doesn't so much test what the values are (since that would be an
-  // almost exact duplication of code with omaha_query_params.cc, and wouldn't
-  // really test anything) as it is a verification that all the params are
-  // present in the generated string.
   EXPECT_TRUE(
       Contains(params, StringPrintf("os=%s", OmahaQueryParams::GetOS())));
   EXPECT_TRUE(
@@ -32,18 +30,17 @@ void TestParams(OmahaQueryParams::ProdId prod_id) {
       StringPrintf("prod=%s", OmahaQueryParams::GetProdIdString(prod_id))));
   EXPECT_TRUE(Contains(
       params,
-      StringPrintf("prodchannel=%s", OmahaQueryParams::GetChannelString())));
+      StringPrintf("prodchannel=%s",
+                   ChromeOmahaQueryParamsDelegate::GetChannelString())));
   EXPECT_TRUE(Contains(
       params,
       StringPrintf("prodversion=%s", chrome::VersionInfo().Version().c_str())));
   EXPECT_TRUE(Contains(
       params,
-      StringPrintf("lang=%s", OmahaQueryParams::GetLang())));
+      StringPrintf("lang=%s", ChromeOmahaQueryParamsDelegate::GetLang())));
 }
 
-TEST(OmahaQueryParams, GetOmahaQueryParams) {
+TEST(ChromeOmahaQueryParamsDelegateTest, GetParams) {
   TestParams(OmahaQueryParams::CRX);
   TestParams(OmahaQueryParams::CHROME);
 }
-
-}  // namespace chrome