Added and replaced some UMAs

chrome/browser/translate/translate_manager_metrics_unittest.cc

Index: chrome/browser/translate/translate_manager_metrics_unittest.cc
diff --git a/chrome/browser/translate/translate_manager_metrics_unittest.cc b/chrome/browser/translate/translate_manager_metrics_unittest.cc
index 91b66aecc2e3c3cbacd809b841c7dca1bba663b8..d7de1485caf54122273d32939570efc181d74b2e 100644
--- a/chrome/browser/translate/translate_manager_metrics_unittest.cc
+++ b/chrome/browser/translate/translate_manager_metrics_unittest.cc
@@ -43,25 +43,25 @@ class MetricsRecorder {
                              int expected_show_infobar) {
     Snapshot();
 
-    EXPECT_EQ(expected_disabled_by_prefs, GetCount(
+    EXPECT_EQ(expected_disabled_by_prefs, GetCountInternal(
         TranslateManagerMetrics::INITIATION_STATUS_DISABLED_BY_PREFS));
-    EXPECT_EQ(expected_disabled_by_switch, GetCount(
+    EXPECT_EQ(expected_disabled_by_switch, GetCountInternal(
         TranslateManagerMetrics::INITIATION_STATUS_DISABLED_BY_SWITCH));
-    EXPECT_EQ(expected_disabled_by_config, GetCount(
+    EXPECT_EQ(expected_disabled_by_config, GetCountInternal(
         TranslateManagerMetrics::INITIATION_STATUS_DISABLED_BY_CONFIG));
-    EXPECT_EQ(expected_language_is_not_supported, GetCount(
+    EXPECT_EQ(expected_language_is_not_supported, GetCountInternal(
         TranslateManagerMetrics::INITIATION_STATUS_LANGUAGE_IS_NOT_SUPPORTED));
-    EXPECT_EQ(expected_url_is_not_supported, GetCount(
+    EXPECT_EQ(expected_url_is_not_supported, GetCountInternal(
         TranslateManagerMetrics::INITIATION_STATUS_URL_IS_NOT_SUPPORTED));
-    EXPECT_EQ(expected_similar_languages, GetCount(
+    EXPECT_EQ(expected_similar_languages, GetCountInternal(
         TranslateManagerMetrics::INITIATION_STATUS_SIMILAR_LANGUAGES));
-    EXPECT_EQ(expected_accept_languages, GetCount(
+    EXPECT_EQ(expected_accept_languages, GetCountInternal(
         TranslateManagerMetrics::INITIATION_STATUS_ACCEPT_LANGUAGES));
-    EXPECT_EQ(expected_auto_by_config, GetCount(
+    EXPECT_EQ(expected_auto_by_config, GetCountInternal(
         TranslateManagerMetrics::INITIATION_STATUS_AUTO_BY_CONFIG));
-    EXPECT_EQ(expected_auto_by_link, GetCount(
+    EXPECT_EQ(expected_auto_by_link, GetCountInternal(
         TranslateManagerMetrics::INITIATION_STATUS_AUTO_BY_LINK));
-    EXPECT_EQ(expected_show_infobar, GetCount(
+    EXPECT_EQ(expected_show_infobar, GetCountInternal(
         TranslateManagerMetrics::INITIATION_STATUS_SHOW_INFOBAR));
   }
 
@@ -75,6 +75,11 @@ class MetricsRecorder {
     return count - base_samples_->TotalCount();
   }
 
+  HistogramBase::Count GetCount(HistogramBase::Sample value) {
+    Snapshot();
+    return GetCountInternal(value);
+  }
+
  private:
   void Snapshot() {
     HistogramBase* histogram = StatisticsRecorder::FindHistogram(key_);
@@ -83,7 +88,7 @@ class MetricsRecorder {
     samples_ = histogram->SnapshotSamples();
   }
 
-  HistogramBase::Count GetCount(HistogramBase::Sample value) {
+  HistogramBase::Count GetCountInternal(HistogramBase::Sample value) {
     if (!samples_.get())
       return 0;
     HistogramBase::Count count = samples_->GetCount(value);
@@ -144,12 +149,25 @@ TEST(TranslateManagerMetricsTest, ReportLanguageDetectionError) {
   EXPECT_EQ(0, recorder.GetTotalCount());
   TranslateManagerMetrics::ReportLanguageDetectionError();
   EXPECT_EQ(1, recorder.GetTotalCount());
+
 }
 
-TEST(TranslateManagerMetricsTest, ReportedUnsupportedLanguage) {
+TEST(TranslateManagerMetricsTest, ReportedUnavailableLanguage) {
+  const int ENGLISH = 25966;
+
   MetricsRecorder recorder(TranslateManagerMetrics::GetMetricsName(
-      TranslateManagerMetrics::UMA_SERVER_REPORTED_UNSUPPORTED_LANGUAGE));
+      TranslateManagerMetrics::UMA_UNAVAILABLE_LANGUAGE));
   EXPECT_EQ(0, recorder.GetTotalCount());
-  TranslateManagerMetrics::ReportUnsupportedLanguage();
-  EXPECT_EQ(1, recorder.GetTotalCount());
+  TranslateManagerMetrics::ReportUnavailableLanguage("en");
+  EXPECT_EQ(1, recorder.GetCount(ENGLISH));
+}
+
+TEST(TranslateManagerMetricsTest, ReportedUnsupportedLanguageAtInitiation) {
+  const int ENGLISH = 25966;
+
+  MetricsRecorder recorder(TranslateManagerMetrics::GetMetricsName(
+      TranslateManagerMetrics::UMA_UNSUPPORTED_LANGUAGE_AT_INITIATION));
+  EXPECT_EQ(0, recorder.GetTotalCount());
+  TranslateManagerMetrics::ReportUnsupportedLanguageAtInitiation("en");
+  EXPECT_EQ(1, recorder.GetCount(ENGLISH));
 }