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

trunk/src/chrome/renderer/translate/translate_helper_metrics.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/metrics/histogram.h"
 
 namespace {
 
 // Constant string values to indicate UMA names. All entries should have
 // a corresponding index in MetricsNameIndex and an entry in |kMetricsEntries|.
 const char kRenderer4LanguageDetection[] = "Renderer4.LanguageDetection";
 const char kTranslateContentLanguage[] = "Translate.ContentLanguage";
-const char kTranslateHtmlLang[] = "Translate.HtmlLang";
 const char kTranslateLanguageVerification[] = "Translate.LanguageVerification";
 const char kTranslateTimeToBeReady[] = "Translate.TimeToBeReady";
 const char kTranslateTimeToLoad[] = "Translate.TimeToLoad";
 const char kTranslateTimeToTranslate[] = "Translate.TimeToTranslate";
 const char kTranslateUserActionDuration[] = "Translate.UserActionDuration";
 const char kTranslatePageScheme[] = "Translate.PageScheme";
 
 const char kSchemeHttp[] = "http";
 const char kSchemeHttps[] = "https";
 
 struct MetricsEntry {
   TranslateHelperMetrics::MetricsNameIndex index;
   const char* const name;
 };
 
 // This entry table should be updated when new UMA items are added.
 const MetricsEntry kMetricsEntries[] = {
   { TranslateHelperMetrics::UMA_LANGUAGE_DETECTION,
     kRenderer4LanguageDetection },
   { TranslateHelperMetrics::UMA_CONTENT_LANGUAGE,
     kTranslateContentLanguage },
-  { TranslateHelperMetrics::UMA_HTML_LANG,
-    kTranslateHtmlLang },
   { TranslateHelperMetrics::UMA_LANGUAGE_VERIFICATION,
     kTranslateLanguageVerification },
   { TranslateHelperMetrics::UMA_TIME_TO_BE_READY,
     kTranslateTimeToBeReady },
   { TranslateHelperMetrics::UMA_TIME_TO_LOAD,
     kTranslateTimeToLoad },
   { TranslateHelperMetrics::UMA_TIME_TO_TRANSLATE,
     kTranslateTimeToTranslate },
   { TranslateHelperMetrics::UMA_USER_ACTION_DURATION,
     kTranslateUserActionDuration },
   { TranslateHelperMetrics::UMA_PAGE_SCHEME,
     kTranslatePageScheme },
 };
 
 COMPILE_ASSERT(arraysize(kMetricsEntries) == TranslateHelperMetrics::UMA_MAX,
                arraysize_of_kMetricsEntries_should_be_UMA_MAX);
 
-TranslateHelperMetrics::LanguageCheckType GetLanguageCheckMetric(
-    const std::string& provided_code,
-    const std::string& revised_code) {
-  if (provided_code.empty())
-    return TranslateHelperMetrics::LANGUAGE_NOT_PROVIDED;
-  else if (provided_code == revised_code)
-    return TranslateHelperMetrics::LANGUAGE_VALID;
-  return TranslateHelperMetrics::LANGUAGE_INVALID;
-}
-
 }  // namespace
 
 namespace TranslateHelperMetrics {
 
 void ReportContentLanguage(const std::string& provided_code,
                            const std::string& revised_code) {
-  UMA_HISTOGRAM_ENUMERATION(kTranslateContentLanguage,
-                            GetLanguageCheckMetric(provided_code, revised_code),
-                            TranslateHelperMetrics::LANGUAGE_MAX);
-}
-
-void ReportHtmlLang(const std::string& provided_code,
-                    const std::string& revised_code) {
-  UMA_HISTOGRAM_ENUMERATION(kTranslateHtmlLang,
-                            GetLanguageCheckMetric(provided_code, revised_code),
-                            TranslateHelperMetrics::LANGUAGE_MAX);
+  if (provided_code.empty()) {
+    UMA_HISTOGRAM_ENUMERATION(kTranslateContentLanguage,
+                              CONTENT_LANGUAGE_NOT_PROVIDED,
+                              CONTENT_LANGUAGE_MAX);
+  } else if (provided_code == revised_code) {
+    UMA_HISTOGRAM_ENUMERATION(kTranslateContentLanguage,
+                              CONTENT_LANGUAGE_VALID,
+                              CONTENT_LANGUAGE_MAX);
+  } else {
+    UMA_HISTOGRAM_ENUMERATION(kTranslateContentLanguage,
+                              CONTENT_LANGUAGE_INVALID,
+                              CONTENT_LANGUAGE_MAX);
+  }
 }
 
 void ReportLanguageVerification(LanguageVerificationType type) {
   UMA_HISTOGRAM_ENUMERATION(kTranslateLanguageVerification,
                             type,
                             LANGUAGE_VERIFICATION_MAX);
 }
 
 void ReportTimeToBeReady(double time_in_msec) {
   UMA_HISTOGRAM_MEDIUM_TIMES(
@@ skipping 37 matching lines @@
 const char* GetMetricsName(MetricsNameIndex index) {
   for (size_t i = 0; i < arraysize(kMetricsEntries); ++i) {
     if (kMetricsEntries[i].index == index)
       return kMetricsEntries[i].name;
   }
   NOTREACHED();
   return NULL;
 }
 
 } // namespace TranslateHelperMetrics