Added and replaced some UMAs

chrome/browser/language_usage_metrics_unittest.cc

 // Copyright (c) 2011 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/language_usage_metrics.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
 
 TEST(LanguageUsageMetricsTest, ParseAcceptLanguages) {
   std::set<int> language_set;
@@ skipping 61 matching lines @@
   LanguageUsageMetrics::ParseAcceptLanguages(",es", &language_set);
   EXPECT_EQ(1U, language_set.size());
   EXPECT_EQ(SPANISH, *language_set.begin());
 
   // Combination of invalid and valid.
   LanguageUsageMetrics::ParseAcceptLanguages("1234,en", &language_set);
   EXPECT_EQ(1U, language_set.size());
   it = language_set.begin();
   EXPECT_EQ(ENGLISH, *it);
 }
-
-TEST(LanguageUsageMetricsTest, ToLanguageCode) {
-  const int SPANISH = 25971;
-  const int JAPANESE = 27233;
-
-  // Basic case.
-  EXPECT_EQ(JAPANESE, LanguageUsageMetrics::ToLanguageCode("ja"));
-
-  // Case is ignored.
-  EXPECT_EQ(SPANISH, LanguageUsageMetrics::ToLanguageCode("Es"));
-
-  // Coutry code is ignored.
-  EXPECT_EQ(JAPANESE, LanguageUsageMetrics::ToLanguageCode("ja-JP"));
-
-  // Invalid locales are considered as unknown language.
-  EXPECT_EQ(0, LanguageUsageMetrics::ToLanguageCode(std::string()));
-  EXPECT_EQ(0, LanguageUsageMetrics::ToLanguageCode("1234"));
-
-  // "xx" is not acceptable because it doesn't exist in ISO 639-1 table.
-  // However, LanguageUsageMetrics doesn't tell what code is valid.
-  EXPECT_EQ(30840, LanguageUsageMetrics::ToLanguageCode("xx"));
-}