Removed translate MetricsNameIndex.

components/translate/core/common/translate_metrics_unittest.cc

Index: components/translate/core/common/translate_metrics_unittest.cc
diff --git a/components/translate/core/common/translate_metrics_unittest.cc b/components/translate/core/common/translate_metrics_unittest.cc
index ac670257f115a9c9137327b926ff4a394d41cd1c..620a5598067bf72683d0fd183f41142c1ce37261 100644
--- a/components/translate/core/common/translate_metrics_unittest.cc
+++ b/components/translate/core/common/translate_metrics_unittest.cc
@@ -37,11 +37,11 @@ class MetricsRecorder {
       base_samples_ = histogram->SnapshotSamples();
   }
 
-  void CheckLanguage(translate::MetricsNameIndex index,
+  void CheckLanguage(const char* metric_name,
                      int expected_not_provided,
                      int expected_valid,
                      int expected_invalid) {
-    ASSERT_EQ(translate::GetMetricsName(index), key_);
+    ASSERT_EQ(metric_name, key_);
 
     Snapshot();
 
@@ -60,7 +60,7 @@ class MetricsRecorder {
                                  int expected_cld_disagree,
                                  int expected_trust_cld,
                                  int expected_cld_complement_sub_code) {
-    ASSERT_EQ(translate::GetMetricsName(translate::UMA_LANGUAGE_VERIFICATION),
+    ASSERT_EQ(translate::metrics_internal::kTranslateLanguageVerification,
               key_);
 
     Snapshot();
@@ -71,9 +71,8 @@ class MetricsRecorder {
     EXPECT_EQ(
         expected_cld_only,
         GetCountWithoutSnapshot(translate::LANGUAGE_VERIFICATION_CLD_ONLY));
-    EXPECT_EQ(
-        expected_unknown,
-        GetCountWithoutSnapshot(translate::LANGUAGE_VERIFICATION_UNKNOWN));
+    EXPECT_EQ(expected_unknown, GetCountWithoutSnapshot(
+                                    translate::LANGUAGE_VERIFICATION_UNKNOWN));
     EXPECT_EQ(
         expected_cld_agree,
         GetCountWithoutSnapshot(translate::LANGUAGE_VERIFICATION_CLD_AGREE));
@@ -89,7 +88,7 @@ class MetricsRecorder {
   }
 
   void CheckScheme(int expected_http, int expected_https, int expected_others) {
-    ASSERT_EQ(translate::GetMetricsName(translate::UMA_PAGE_SCHEME), key_);
+    ASSERT_EQ(translate::metrics_internal::kTranslatePageScheme, key_);
 
     Snapshot();
 
@@ -161,32 +160,40 @@ class MetricsRecorder {
 
 TEST(TranslateMetricsTest, ReportContentLanguage) {
   MetricsRecorder recorder(
-      translate::GetMetricsName(translate::UMA_CONTENT_LANGUAGE));
+      translate::metrics_internal::kTranslateContentLanguage);
 
-  recorder.CheckLanguage(translate::UMA_CONTENT_LANGUAGE, 0, 0, 0);
+  recorder.CheckLanguage(translate::metrics_internal::kTranslateContentLanguage,
+                         0, 0, 0);
   translate::ReportContentLanguage(std::string(), std::string());
-  recorder.CheckLanguage(translate::UMA_CONTENT_LANGUAGE, 1, 0, 0);
+  recorder.CheckLanguage(translate::metrics_internal::kTranslateContentLanguage,
+                         1, 0, 0);
   translate::ReportContentLanguage("ja_JP", "ja-JP");
-  recorder.CheckLanguage(translate::UMA_CONTENT_LANGUAGE, 1, 0, 1);
+  recorder.CheckLanguage(translate::metrics_internal::kTranslateContentLanguage,
+                         1, 0, 1);
   translate::ReportContentLanguage("en", "en");
-  recorder.CheckLanguage(translate::UMA_CONTENT_LANGUAGE, 1, 1, 1);
+  recorder.CheckLanguage(translate::metrics_internal::kTranslateContentLanguage,
+                         1, 1, 1);
 }
 
 TEST(TranslateMetricsTest, ReportHtmlLang) {
-  MetricsRecorder recorder(translate::GetMetricsName(translate::UMA_HTML_LANG));
+  MetricsRecorder recorder(translate::metrics_internal::kTranslateHtmlLang);
 
-  recorder.CheckLanguage(translate::UMA_HTML_LANG, 0, 0, 0);
+  recorder.CheckLanguage(translate::metrics_internal::kTranslateHtmlLang, 0, 0,
+                         0);
   translate::ReportHtmlLang(std::string(), std::string());
-  recorder.CheckLanguage(translate::UMA_HTML_LANG, 1, 0, 0);
+  recorder.CheckLanguage(translate::metrics_internal::kTranslateHtmlLang, 1, 0,
+                         0);
   translate::ReportHtmlLang("ja_JP", "ja-JP");
-  recorder.CheckLanguage(translate::UMA_HTML_LANG, 1, 0, 1);
+  recorder.CheckLanguage(translate::metrics_internal::kTranslateHtmlLang, 1, 0,
+                         1);
   translate::ReportHtmlLang("en", "en");
-  recorder.CheckLanguage(translate::UMA_HTML_LANG, 1, 1, 1);
+  recorder.CheckLanguage(translate::metrics_internal::kTranslateHtmlLang, 1, 1,
+                         1);
 }
 
 TEST(TranslateMetricsTest, ReportLanguageVerification) {
   MetricsRecorder recorder(
-      translate::GetMetricsName(translate::UMA_LANGUAGE_VERIFICATION));
+      translate::metrics_internal::kTranslateLanguageVerification);
 
   recorder.CheckLanguageVerification(0, 0, 0, 0, 0, 0, 0);
   translate::ReportLanguageVerification(
@@ -214,7 +221,7 @@ TEST(TranslateMetricsTest, ReportLanguageVerification) {
 
 TEST(TranslateMetricsTest, ReportTimeToBeReady) {
   MetricsRecorder recorder(
-      translate::GetMetricsName(translate::UMA_TIME_TO_BE_READY));
+      translate::metrics_internal::kTranslateTimeToBeReady);
   recorder.CheckTotalCount(0);
   translate::ReportTimeToBeReady(3.14);
   recorder.CheckValueInLogs(3.14);
@@ -222,8 +229,7 @@ TEST(TranslateMetricsTest, ReportTimeToBeReady) {
 }
 
 TEST(TranslateMetricsTest, ReportTimeToLoad) {
-  MetricsRecorder recorder(
-      translate::GetMetricsName(translate::UMA_TIME_TO_LOAD));
+  MetricsRecorder recorder(translate::metrics_internal::kTranslateTimeToLoad);
   recorder.CheckTotalCount(0);
   translate::ReportTimeToLoad(573.0);
   recorder.CheckValueInLogs(573.0);
@@ -232,7 +238,7 @@ TEST(TranslateMetricsTest, ReportTimeToLoad) {
 
 TEST(TranslateMetricsTest, ReportTimeToTranslate) {
   MetricsRecorder recorder(
-      translate::GetMetricsName(translate::UMA_TIME_TO_TRANSLATE));
+      translate::metrics_internal::kTranslateTimeToTranslate);
   recorder.CheckTotalCount(0);
   translate::ReportTimeToTranslate(4649.0);
   recorder.CheckValueInLogs(4649.0);
@@ -241,7 +247,7 @@ TEST(TranslateMetricsTest, ReportTimeToTranslate) {
 
 TEST(TranslateMetricsTest, ReportUserActionDuration) {
   MetricsRecorder recorder(
-      translate::GetMetricsName(translate::UMA_USER_ACTION_DURATION));
+      translate::metrics_internal::kTranslateUserActionDuration);
   recorder.CheckTotalCount(0);
   TimeTicks begin = TimeTicks::Now();
   TimeTicks end = begin + base::TimeDelta::FromSeconds(3776);
@@ -251,8 +257,7 @@ TEST(TranslateMetricsTest, ReportUserActionDuration) {
 }
 
 TEST(TranslateMetricsTest, ReportPageScheme) {
-  MetricsRecorder recorder(
-      translate::GetMetricsName(translate::UMA_PAGE_SCHEME));
+  MetricsRecorder recorder(translate::metrics_internal::kTranslatePageScheme);
   recorder.CheckScheme(0, 0, 0);
   translate::ReportPageScheme("http");
   recorder.CheckScheme(1, 0, 0);
@@ -264,7 +269,7 @@ TEST(TranslateMetricsTest, ReportPageScheme) {
 
 TEST(TranslateMetricsTest, ReportSimilarLanguageMatch) {
   MetricsRecorder recorder(
-      translate::GetMetricsName(translate::UMA_SIMILAR_LANGUAGE_MATCH));
+      translate::metrics_internal::kTranslateSimilarLanguageMatch);
   recorder.CheckTotalCount(0);
   EXPECT_EQ(0, recorder.GetCount(kTrue));
   EXPECT_EQ(0, recorder.GetCount(kFalse));
@@ -278,7 +283,7 @@ TEST(TranslateMetricsTest, ReportSimilarLanguageMatch) {
 
 TEST(TranslateMetricsTest, ReportLanguageDetectionTime) {
   MetricsRecorder recorder(
-      translate::GetMetricsName(translate::UMA_LANGUAGE_DETECTION));
+      translate::metrics_internal::kRenderer4LanguageDetection);
   recorder.CheckTotalCount(0);
   TimeTicks begin = TimeTicks::Now();
   TimeTicks end = begin + base::TimeDelta::FromMicroseconds(9009);
@@ -289,7 +294,7 @@ TEST(TranslateMetricsTest, ReportLanguageDetectionTime) {
 
 TEST(TranslateMetricsTest, ReportLanguageDetectionConflict) {
   MetricsRecorder recorder(
-      translate::GetMetricsName(translate::UMA_LANGUAGE_DETECTION_CONFLICT));
+      translate::metrics_internal::kTranslateLanguageDetectionConflict);
   recorder.CheckTotalCount(0);
 
   translate::ReportLanguageDetectionConflict("en", "es");