Move language detection to a component

components/translate/common/translate_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/common/translate/translate_common_metrics.h"
+#include "components/translate/common/translate_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 kTranslateSimilarLanguageMatch[] = "Translate.SimilarLanguageMatch";
 
 const char kSchemeHttp[] = "http";
 const char kSchemeHttps[] = "https";
 
 struct MetricsEntry {
-  TranslateCommonMetrics::MetricsNameIndex index;
+  translate::MetricsNameIndex index;
   const char* const name;
 };
 
 // This entry table should be updated when new UMA items are added.
 const MetricsEntry kMetricsEntries[] = {
-  { TranslateCommonMetrics::UMA_LANGUAGE_DETECTION,
-    kRenderer4LanguageDetection },
-  { TranslateCommonMetrics::UMA_CONTENT_LANGUAGE,
-    kTranslateContentLanguage },
-  { TranslateCommonMetrics::UMA_HTML_LANG,
-    kTranslateHtmlLang },
-  { TranslateCommonMetrics::UMA_LANGUAGE_VERIFICATION,
-    kTranslateLanguageVerification },
-  { TranslateCommonMetrics::UMA_TIME_TO_BE_READY,
-    kTranslateTimeToBeReady },
-  { TranslateCommonMetrics::UMA_TIME_TO_LOAD,
-    kTranslateTimeToLoad },
-  { TranslateCommonMetrics::UMA_TIME_TO_TRANSLATE,
-    kTranslateTimeToTranslate },
-  { TranslateCommonMetrics::UMA_USER_ACTION_DURATION,
-    kTranslateUserActionDuration },
-  { TranslateCommonMetrics::UMA_PAGE_SCHEME,
-    kTranslatePageScheme },
-  { TranslateCommonMetrics::UMA_SIMILAR_LANGUAGE_MATCH,
-    kTranslateSimilarLanguageMatch },
-};
+    {translate::UMA_LANGUAGE_DETECTION, kRenderer4LanguageDetection},
+    {translate::UMA_CONTENT_LANGUAGE, kTranslateContentLanguage},
+    {translate::UMA_HTML_LANG, kTranslateHtmlLang},
+    {translate::UMA_LANGUAGE_VERIFICATION, kTranslateLanguageVerification},
+    {translate::UMA_TIME_TO_BE_READY, kTranslateTimeToBeReady},
+    {translate::UMA_TIME_TO_LOAD, kTranslateTimeToLoad},
+    {translate::UMA_TIME_TO_TRANSLATE, kTranslateTimeToTranslate},
+    {translate::UMA_USER_ACTION_DURATION, kTranslateUserActionDuration},
+    {translate::UMA_PAGE_SCHEME, kTranslatePageScheme},
+    {translate::UMA_SIMILAR_LANGUAGE_MATCH, kTranslateSimilarLanguageMatch}, };
 
-COMPILE_ASSERT(arraysize(kMetricsEntries) == TranslateCommonMetrics::UMA_MAX,
+COMPILE_ASSERT(arraysize(kMetricsEntries) == translate::UMA_MAX,
                arraysize_of_kMetricsEntries_should_be_UMA_MAX);
 
-TranslateCommonMetrics::LanguageCheckType GetLanguageCheckMetric(
+translate::LanguageCheckType GetLanguageCheckMetric(
     const std::string& provided_code,
     const std::string& revised_code) {
   if (provided_code.empty())
-    return TranslateCommonMetrics::LANGUAGE_NOT_PROVIDED;
+    return translate::LANGUAGE_NOT_PROVIDED;
   else if (provided_code == revised_code)
-    return TranslateCommonMetrics::LANGUAGE_VALID;
-  return TranslateCommonMetrics::LANGUAGE_INVALID;
+    return translate::LANGUAGE_VALID;
+  return translate::LANGUAGE_INVALID;
 }
 
 }  // namespace
 
-namespace TranslateCommonMetrics {
+namespace translate {
 
 void ReportContentLanguage(const std::string& provided_code,
                            const std::string& revised_code) {
   UMA_HISTOGRAM_ENUMERATION(kTranslateContentLanguage,
                             GetLanguageCheckMetric(provided_code, revised_code),
-                            TranslateCommonMetrics::LANGUAGE_MAX);
+                            translate::LANGUAGE_MAX);

[blundell, 2013/10/02 10:01:17]

nit: you can get rid of the usages of translate:: when you're in the translate
namespace.

[droger, 2013/10/02 10:59:41]

Done.

 }
 
 void ReportHtmlLang(const std::string& provided_code,
                     const std::string& revised_code) {
   UMA_HISTOGRAM_ENUMERATION(kTranslateHtmlLang,
                             GetLanguageCheckMetric(provided_code, revised_code),
-                            TranslateCommonMetrics::LANGUAGE_MAX);
+                            translate::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 36 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 TranslateCommonMetrics
+}  // namespace translate