Revert 202427 "Translate: adopt html lang attribute if valid val..."

trunk/src/chrome/renderer/translate/translate_helper_metrics_unittest.cc

Index: trunk/src/chrome/renderer/translate/translate_helper_metrics_unittest.cc
===================================================================
--- trunk/src/chrome/renderer/translate/translate_helper_metrics_unittest.cc	(revision 202442)
+++ trunk/src/chrome/renderer/translate/translate_helper_metrics_unittest.cc	(working copy)
@@ -33,20 +33,23 @@
       base_samples_ = histogram->SnapshotSamples();
   }
 
-  void CheckLanguage(TranslateHelperMetrics::MetricsNameIndex index,
-                     int expected_not_provided,
-                     int expected_valid,
-                     int expected_invalid) {
-    ASSERT_EQ(TranslateHelperMetrics::GetMetricsName(index), key_);
+  void CheckContentLanguage(int expected_not_provided,
+                            int expected_valid,
+                            int expected_invalid) {
+    ASSERT_EQ(TranslateHelperMetrics::GetMetricsName(
+        TranslateHelperMetrics::UMA_CONTENT_LANGUAGE), key_);
 
     Snapshot();
 
-    EXPECT_EQ(expected_not_provided,
-              GetCount(TranslateHelperMetrics::LANGUAGE_NOT_PROVIDED));
-    EXPECT_EQ(expected_valid,
-              GetCount(TranslateHelperMetrics::LANGUAGE_VALID));
-    EXPECT_EQ(expected_invalid,
-              GetCount(TranslateHelperMetrics::LANGUAGE_INVALID));
+    EXPECT_EQ(
+        expected_not_provided,
+        GetCount(TranslateHelperMetrics::CONTENT_LANGUAGE_NOT_PROVIDED));
+    EXPECT_EQ(
+        expected_valid,
+        GetCount(TranslateHelperMetrics::CONTENT_LANGUAGE_VALID));
+    EXPECT_EQ(
+        expected_invalid,
+        GetCount(TranslateHelperMetrics::CONTENT_LANGUAGE_INVALID));
   }
 
   void CheckLanguageVerification(int expected_cld_disabled,
@@ -147,28 +150,15 @@
   MetricsRecorder recorder(TranslateHelperMetrics::GetMetricsName(
       TranslateHelperMetrics::UMA_CONTENT_LANGUAGE));
 
-  recorder.CheckLanguage(TranslateHelperMetrics::UMA_CONTENT_LANGUAGE, 0, 0, 0);
+  recorder.CheckContentLanguage(0, 0, 0);
   TranslateHelperMetrics::ReportContentLanguage(std::string(), std::string());
-  recorder.CheckLanguage(TranslateHelperMetrics::UMA_CONTENT_LANGUAGE, 1, 0, 0);
+  recorder.CheckContentLanguage(1, 0, 0);
   TranslateHelperMetrics::ReportContentLanguage("ja_JP", "ja-JP");
-  recorder.CheckLanguage(TranslateHelperMetrics::UMA_CONTENT_LANGUAGE, 1, 0, 1);
+  recorder.CheckContentLanguage(1, 0, 1);
   TranslateHelperMetrics::ReportContentLanguage("en", "en");
-  recorder.CheckLanguage(TranslateHelperMetrics::UMA_CONTENT_LANGUAGE, 1, 1, 1);
+  recorder.CheckContentLanguage(1, 1, 1);
 }
 
-TEST(TranslateHelperMetricsTest, ReportHtmlLang) {
-  MetricsRecorder recorder(TranslateHelperMetrics::GetMetricsName(
-      TranslateHelperMetrics::UMA_HTML_LANG));
-
-  recorder.CheckLanguage(TranslateHelperMetrics::UMA_HTML_LANG, 0, 0, 0);
-  TranslateHelperMetrics::ReportHtmlLang(std::string(), std::string());
-  recorder.CheckLanguage(TranslateHelperMetrics::UMA_HTML_LANG, 1, 0, 0);
-  TranslateHelperMetrics::ReportHtmlLang("ja_JP", "ja-JP");
-  recorder.CheckLanguage(TranslateHelperMetrics::UMA_HTML_LANG, 1, 0, 1);
-  TranslateHelperMetrics::ReportHtmlLang("en", "en");
-  recorder.CheckLanguage(TranslateHelperMetrics::UMA_HTML_LANG, 1, 1, 1);
-}
-
 TEST(TranslateHelperMetricsTest, ReportLanguageVerification) {
   MetricsRecorder recorder(TranslateHelperMetrics::GetMetricsName(
       TranslateHelperMetrics::UMA_LANGUAGE_VERIFICATION));