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

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

 // Copyright 2013 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/renderer/translate/translate_helper_metrics.h"
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/metrics/histogram.h"
 #include "base/metrics/histogram_samples.h"
@@ skipping 15 matching lines @@
       : key_(key),
         base_samples_(NULL),
         samples_(NULL) {
     StatisticsRecorder::Initialize();
 
     HistogramBase* histogram = StatisticsRecorder::FindHistogram(key_);
     if (histogram)
       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,
                                  int expected_cld_only,
                                  int expected_unknown,
                                  int expected_cld_agree,
                                  int expected_cld_disagree) {
     ASSERT_EQ(TranslateHelperMetrics::GetMetricsName(
         TranslateHelperMetrics::UMA_LANGUAGE_VERIFICATION), key_);
 
@@ skipping 80 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(MetricsRecorder);
 };
 
 }  // namespace
 
 TEST(TranslateHelperMetricsTest, ReportContentLanguage) {
   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);
-}
-
-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);
+  recorder.CheckContentLanguage(1, 1, 1);
 }
 
 TEST(TranslateHelperMetricsTest, ReportLanguageVerification) {
   MetricsRecorder recorder(TranslateHelperMetrics::GetMetricsName(
       TranslateHelperMetrics::UMA_LANGUAGE_VERIFICATION));
 
   recorder.CheckLanguageVerification(0, 0, 0, 0, 0);
   TranslateHelperMetrics::ReportLanguageVerification(
       TranslateHelperMetrics::LANGUAGE_VERIFICATION_CLD_DISABLED);
   recorder.CheckLanguageVerification(1, 0, 0, 0, 0);
@@ skipping 68 matching lines @@
       TranslateHelperMetrics::UMA_LANGUAGE_DETECTION));
   recorder.CheckTotalCount(0);
   TimeTicks begin = TimeTicks::Now();
   TimeTicks end = begin + base::TimeDelta::FromMicroseconds(9009);
   TranslateHelperMetrics::ReportLanguageDetectionTime(begin, end);
   recorder.CheckValueInLogs(9.009);
   recorder.CheckTotalCount(1);
 }
 
 #endif  // defined(ENABLE_LANGUAGE_DETECTION)