Revert 207805 "Differential updates for components. We are addin..."

trunk/src/chrome/common/omaha_query_params/omaha_query_params.cc

 // Copyright (c) 2012 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 "chrome/common/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/common/chrome_version_info.h"
@@ skipping 31 matching lines @@
 #elif defined(__mips__)
   "mipsel";
 #else
   #error "unknown arch"
 #endif
 
 const char kChrome[] = "chrome";
 const char kChromeCrx[] = "chromecrx";
 const char kChromiumCrx[] = "chromiumcrx";
 
+const char* GetProdIdString(chrome::OmahaQueryParams::ProdId prod) {
+  switch (prod) {
+    case chrome::OmahaQueryParams::CHROME:
+      return kChrome;
+      break;
+    case chrome::OmahaQueryParams::CRX:
+#if defined(GOOGLE_CHROME_BUILD)
+      return kChromeCrx;
+#else
+      return kChromiumCrx;
+#endif
+      break;
+  }
+  return kUnknown;
+}
+
 const char kStable[] = "stable";
 const char kBeta[] = "beta";
 const char kDev[] = "dev";
 const char kCanary[] = "canary";
 
 const char* GetChannelString() {
   switch (chrome::VersionInfo::GetChannel()) {
     case chrome::VersionInfo::CHANNEL_STABLE:
       return kStable;
       break;
@@ skipping 10 matching lines @@
       return kUnknown;
       break;
   }
   return kUnknown;
 }
 
 }  // namespace
 
 namespace chrome {
 
-// static
 std::string OmahaQueryParams::Get(ProdId prod) {
   return base::StringPrintf(
       "os=%s&arch=%s&nacl_arch=%s&prod=%s&prodchannel=%s&prodversion=%s",
       kOs,
       kArch,
       getNaclArch(),
       GetProdIdString(prod),
       GetChannelString(),
       chrome::VersionInfo().Version().c_str());
 }
 
 // static
-const char* OmahaQueryParams::GetProdIdString(
-    chrome::OmahaQueryParams::ProdId prod) {
-  switch (prod) {
-    case chrome::OmahaQueryParams::CHROME:
-      return kChrome;
-      break;
-    case chrome::OmahaQueryParams::CRX:
-#if defined(GOOGLE_CHROME_BUILD)
-      return kChromeCrx;
-#else
-      return kChromiumCrx;
-#endif
-      break;
-  }
-  return kUnknown;
-}
-
-// static
 const char* OmahaQueryParams::getOS() {
   return kOs;
 }
 
 // static
 const char* OmahaQueryParams::getArch() {
   return kArch;
 }
 
 // static
@@ skipping 13 matching lines @@
 #elif defined(ARCH_CPU_MIPSEL)
   return "mips32";
 #else
   // NOTE: when adding new values here, please remember to update the
   // comment in the .h file about possible return values from this function.
 #error "You need to add support for your architecture here"
 #endif
 }
 
 }  // namespace chrome