Move OmahaQueryParams to a component and add a delegate interface.

components/omaha_query_params/omaha_query_params.cc

Index: components/omaha_query_params/omaha_query_params.cc
diff --git a/chrome/browser/omaha_query_params/omaha_query_params.cc b/components/omaha_query_params/omaha_query_params.cc
similarity index 65%
rename from chrome/browser/omaha_query_params/omaha_query_params.cc
rename to components/omaha_query_params/omaha_query_params.cc
index df4e6048fcce804e99dc4f30c18dc4891934b2a6..d8937d405446cb12e46a6b09eef87180bc8411a5 100644
--- a/chrome/browser/omaha_query_params/omaha_query_params.cc
+++ b/components/omaha_query_params/omaha_query_params.cc
@@ -2,13 +2,12 @@
 // 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 "components/omaha_query_params/omaha_query_params.h"
 
 #include "base/compiler_specific.h"
 #include "base/strings/stringprintf.h"
 #include "base/win/windows_version.h"
-#include "chrome/browser/browser_process.h"
-#include "chrome/common/chrome_version_info.h"
+#include "content/public/common/content_client.h"
 
 namespace {
 
@@ -50,43 +49,34 @@ const char kArch[] =
 
 const char kChrome[] = "chrome";
 
-const char kStable[] = "stable";
-const char kBeta[] = "beta";
-const char kDev[] = "dev";
-const char kCanary[] = "canary";
-
 #if defined(GOOGLE_CHROME_BUILD)
 const char kChromeCrx[] = "chromecrx";
 #else
 const char kChromiumCrx[] = "chromiumcrx";
 #endif  // defined(GOOGLE_CHROME_BUILD)
 
-}  // namespace
+OmahaQueryParamsDelegate* g_delegate = NULL;
 
-namespace chrome {
+}  // namespace
 
 // static
 std::string OmahaQueryParams::Get(ProdId prod) {
   return base::StringPrintf(
-      "os=%s&arch=%s&nacl_arch=%s&prod=%s&prodchannel=%s"
-          "&prodversion=%s&lang=%s",
+      "os=%s&arch=%s&nacl_arch=%s&prod=%s%s",
       kOs,
       kArch,
       GetNaclArch(),
       GetProdIdString(prod),
-      GetChannelString(),
-      chrome::VersionInfo().Version().c_str(),
-      GetLang());
+      g_delegate ? g_delegate->GetExtraParams().c_str() : "");
 }
 
 // static
-const char* OmahaQueryParams::GetProdIdString(
-    chrome::OmahaQueryParams::ProdId prod) {
+const char* OmahaQueryParams::GetProdIdString(OmahaQueryParams::ProdId prod) {
   switch (prod) {
-    case chrome::OmahaQueryParams::CHROME:
+    case OmahaQueryParams::CHROME:
       return kChrome;
       break;
-    case chrome::OmahaQueryParams::CRX:
+    case OmahaQueryParams::CRX:
 #if defined(GOOGLE_CHROME_BUILD)
       return kChromeCrx;
 #else
@@ -132,29 +122,12 @@ const char* OmahaQueryParams::GetNaclArch() {
 #endif
 }
 
-const char* OmahaQueryParams::GetChannelString() {
-  switch (chrome::VersionInfo::GetChannel()) {
-    case chrome::VersionInfo::CHANNEL_STABLE:
-      return kStable;
-      break;
-    case chrome::VersionInfo::CHANNEL_BETA:
-      return kBeta;
-      break;
-    case chrome::VersionInfo::CHANNEL_DEV:
-      return kDev;
-      break;
-    case chrome::VersionInfo::CHANNEL_CANARY:
-      return kCanary;
-      break;
-    case chrome::VersionInfo::CHANNEL_UNKNOWN:
-      return kUnknown;
-      break;
-  }
-  return kUnknown;
+OmahaQueryParamsDelegate::OmahaQueryParamsDelegate() {
 }
 
-const char* OmahaQueryParams::GetLang() {
-  return g_browser_process->GetApplicationLocale().c_str();
+OmahaQueryParamsDelegate::~OmahaQueryParamsDelegate() {
 }
 
-}  // namespace chrome
+void OmahaQueryParamsDelegate::Set(OmahaQueryParamsDelegate* delegate) {
+  g_delegate = delegate;

[asargent_no_longer_on_chrome, 2014/06/23 18:20:59]

should it be an error to replace a non-null one with another non-null one? 

E.g. do we want:

DCHECK(!g_delegate || !delegate)

here?

[Yoyo Zhou, 2014/06/23 23:48:33]

Yes, I think so.

After discussion with the webstore team, it turns out that you can't omit the
prodversion, because pre-M31 chrome is now desupported. I'll add a delegate for
AppShell with a fake but sufficiently high version number.

+}