Include the language (locale) info in the update ping

chrome/browser/component_updater/pnacl/pnacl_component_installer.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/browser/component_updater/pnacl/pnacl_component_installer.h"
 
 #include "base/atomicops.h"
 #include "base/base_paths.h"
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/file_util.h"
 #include "base/files/file_enumerator.h"
 #include "base/files/file_path.h"
 #include "base/json/json_file_value_serializer.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/strings/string_util.h"
 #include "base/values.h"
 #include "base/version.h"
 #include "base/win/windows_version.h"
 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/component_updater/component_updater_service.h"
+#include "chrome/browser/omaha_query_params/omaha_query_params.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/common/chrome_paths.h"
-#include "chrome/common/omaha_query_params/omaha_query_params.h"
 #include "components/nacl/common/nacl_switches.h"
 #include "content/public/browser/browser_thread.h"
 
 using chrome::OmahaQueryParams;
 using content::BrowserThread;
 
 namespace component_updater {
 
 namespace {
 
@@ skipping 33 matching lines @@
 void CheckVersionCompatiblity(const base::Version& current_version) {
   // Using NoBarrier, since needs_on_demand_update is standalone and does
   // not have other associated data.
   base::subtle::NoBarrier_Store(&needs_on_demand_update,
                                 current_version.IsOlderThan(kMinPnaclVersion));
 }
 
 // PNaCl is packaged as a multi-CRX.  This returns the platform-specific
 // subdirectory that is part of that multi-CRX.
 base::FilePath GetPlatformDir(const base::FilePath& base_path) {
-  std::string arch = SanitizeForPath(OmahaQueryParams::getNaclArch());
+  std::string arch = SanitizeForPath(OmahaQueryParams::GetNaclArch());
   return base_path.AppendASCII("_platform_specific").AppendASCII(arch);
 }
 
 // Tell the rest of the world where to find the platform-specific PNaCl files.
 void OverrideDirPnaclComponent(const base::FilePath& base_path) {
   PathService::Override(chrome::DIR_PNACL_COMPONENT,
                         GetPlatformDir(base_path));
 }
 
 bool GetLatestPnaclDirectory(PnaclComponentInstaller* pci,
@@ skipping 91 matching lines @@
                  << version.GetString();
     return false;
   }
 
   // Now check the |pnacl_manifest|.
   std::string arch;
   if (!pnacl_manifest.GetStringASCII("pnacl-arch", &arch)) {
     LOG(WARNING) << "'pnacl-arch' field is missing from pnacl-manifest!";
     return false;
   }
-  if (arch.compare(OmahaQueryParams::getNaclArch()) != 0) {
-    LOG(WARNING) << "'pnacl-arch' field in manifest is invalid ("
-                 << arch << " vs " << OmahaQueryParams::getNaclArch() << ")";
+  if (arch.compare(OmahaQueryParams::GetNaclArch()) != 0) {
+    LOG(WARNING) << "'pnacl-arch' field in manifest is invalid (" << arch
+                 << " vs " << OmahaQueryParams::GetNaclArch() << ")";
     return false;
   }
 
   *version_out = version;
   return true;
 }
 
 }  // namespace
 
 PnaclComponentInstaller::PnaclComponentInstaller()
@@ skipping 252 matching lines @@
 }  // namespace component_updater
 
 namespace pnacl {
 
 bool NeedsOnDemandUpdate() {
   return base::subtle::NoBarrier_Load(
       &component_updater::needs_on_demand_update) != 0;
 }
 
 }  // namespace pnacl