Clean up a few more unused globals.

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 28 matching lines @@
   "x86";
 #elif defined(__arm__)
   "arm";
 #elif defined(__mips__)
   "mipsel";
 #else
   #error "unknown arch"
 #endif
 
 const char kChrome[] = "chrome";
-const char kChromeCrx[] = "chromecrx";
-const char kChromiumCrx[] = "chromiumcrx";
 
 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
 
 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,
@@ skipping 69 matching lines @@
       return kCanary;
       break;
     case chrome::VersionInfo::CHANNEL_UNKNOWN:
       return kUnknown;
       break;
   }
   return kUnknown;
 }
 
 }  // namespace chrome