Added and replaced some UMAs

chrome/browser/language_usage_metrics.cc

Index: chrome/browser/language_usage_metrics.cc
diff --git a/chrome/browser/language_usage_metrics.cc b/chrome/browser/language_usage_metrics.cc
index 4485b1082b3450eecec72fa1ab43807afba48419..a8702133e4020e5b3863591c26988a341cbc547c 100644
--- a/chrome/browser/language_usage_metrics.cc
+++ b/chrome/browser/language_usage_metrics.cc
@@ -9,6 +9,7 @@
 #include "base/metrics/sparse_histogram.h"
 #include "base/string_util.h"

[Takashi Toyoshima, 2013/05/21 11:11:43]

can you remove this?

[hajimehoshi, 2013/05/22 04:19:27]

Done.

 #include "base/strings/string_tokenizer.h"
+#include "chrome/common/metrics/metrics_util.h"
 
 namespace {
 void RecordAcceptLanguage(int language_code) {
@@ -28,7 +29,7 @@ void LanguageUsageMetrics::RecordAcceptLanguages(
 // static
 void LanguageUsageMetrics::RecordApplicationLanguage(
     const std::string& application_locale) {
-  const int language_code = ToLanguageCode(application_locale);
+  const int language_code = metrics::ToLanguageCode(application_locale);
   if (language_code != 0)
     UMA_HISTOGRAM_SPARSE_SLOWLY("LanguageUsage.ApplicationLanguage",
                                 language_code);
@@ -41,31 +42,8 @@ void LanguageUsageMetrics::ParseAcceptLanguages(
   languages->clear();
   base::StringTokenizer locales(accept_languages, ",");
   while (locales.GetNext()) {
-    const int language_code = ToLanguageCode(locales.token());
+    const int language_code = metrics::ToLanguageCode(locales.token());
     if (language_code != 0)
       languages->insert(language_code);
   }
 }
-
-// static
-int LanguageUsageMetrics::ToLanguageCode(const std::string& locale) {
-  base::StringTokenizer parts(locale, "-_");
-  if (!parts.GetNext())
-    return 0;
-
-  std::string language_part = parts.token();
-  StringToLowerASCII(&language_part);
-
-  int language_code = 0;
-  for (std::string::iterator it = language_part.begin();
-       it != language_part.end(); ++it) {
-    char ch = *it;
-    if (ch < 'a' || 'z' < ch)
-      return 0;
-
-    language_code <<= 8;
-    language_code += ch;
-  }
-
-  return language_code;
-}