Remove ENABLE_LANGUAGE_DETECTION

Now that CLD is used on all platforms, let's remove ENABLE_LANGUAGE_DETECTION.

BUG=248454
TEST=unit_tests

Review URL: https://chromiumcodereview.appspot.com/18820002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@213361 0039d316-1c4b-4281-b951-d872f2087c98

build/common.gypi

@@ -337,9 +337,6 @@
       # Enable Google Now.
       'enable_google_now%': 1,
 
-      # Enable language detection.
-      'enable_language_detection%': 1,
-
       # Enable printing support and UI.
       'enable_printing%': 1,
 
@@ -513,7 +510,6 @@
           'enable_automation%': 0,
           'enable_extensions%': 0,
           'enable_google_now%': 0,
-          'enable_language_detection%': 1,
           'enable_printing%': 0,
           'enable_themes%': 0,
           'proprietary_codecs%': 1,
@@ -546,7 +542,6 @@
           'enable_automation%': 0,
           'enable_extensions%': 0,
           'enable_google_now%': 0,
-          'enable_language_detection%': 1,
           'enable_printing%': 0,
           'enable_session_service%': 0,
           'enable_themes%': 0,
@@ -823,7 +818,6 @@
     'enable_automation%': '<(enable_automation)',
     'enable_printing%': '<(enable_printing)',
     'enable_google_now%': '<(enable_google_now)',
-    'enable_language_detection%': '<(enable_language_detection)',
     'enable_captive_portal_detection%': '<(enable_captive_portal_detection)',
     'disable_ftp_support%': '<(disable_ftp_support)',
     'enable_task_manager%': '<(enable_task_manager)',
@@ -2229,9 +2223,6 @@
       ['enable_google_now==1', {
         'defines': ['ENABLE_GOOGLE_NOW=1'],
       }],
-      ['enable_language_detection==1', {
-        'defines': ['ENABLE_LANGUAGE_DETECTION=1'],
-      }],
       ['enable_printing==1', {
         'defines': ['ENABLE_PRINTING=1'],
       }],

chrome/browser/chrome_browser_main.cc

@@ -62,6 +62,7 @@
 #include "chrome/browser/gpu/chrome_gpu_util.h"
 #include "chrome/browser/gpu/gl_string_manager.h"
 #include "chrome/browser/jankometer.h"
+#include "chrome/browser/language_usage_metrics.h"
 #include "chrome/browser/metrics/field_trial_synchronizer.h"
 #include "chrome/browser/metrics/metrics_log.h"
 #include "chrome/browser/metrics/metrics_service.h"
@@ -186,10 +187,6 @@
 #include "chrome/browser/mac/keystone_glue.h"
 #endif
 
-#if defined(ENABLE_LANGUAGE_DETECTION)
-#include "chrome/browser/language_usage_metrics.h"
-#endif
-
 #if defined(ENABLE_RLZ)
 #include "chrome/browser/rlz/rlz.h"
 #endif
@@ -1474,12 +1471,10 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
   browser_process_->metrics_service()->RecordBreakpadHasDebugger(
       base::debug::BeingDebugged());
 
-#if defined(ENABLE_LANGUAGE_DETECTION)
   LanguageUsageMetrics::RecordAcceptLanguages(
       profile_->GetPrefs()->GetString(prefs::kAcceptLanguages));
   LanguageUsageMetrics::RecordApplicationLanguage(
       browser_process_->GetApplicationLocale());
-#endif
 
   // The extension service may be available at this point. If the command line
   // specifies --uninstall-extension, attempt the uninstall extension startup

chrome/chrome_browser.gypi

@@ -2843,12 +2843,6 @@
             ['exclude', '^browser/automation/'],
           ],
         }],
-        ['enable_language_detection==0', {
-          'sources!': [
-            'browser/language_usage_metrics.cc',
-            'browser/language_usage_metrics.h',
-          ],
-        }],
         ['enable_printing!=1', {
           'sources/': [
             ['exclude', '^browser/printing/'],

chrome/chrome_common.gypi

@@ -24,6 +24,7 @@
         # TODO(gregoryd): chrome_resources and chrome_strings could be
         #  shared with the 64-bit target, but it does not work due to a gyp
         # issue.
+        '../third_party/cld/cld.gyp:cld',
         'common_net',
         'common_version',
         'installer_util',
@@ -650,11 +651,6 @@
             'common/media/webrtc_logging_messages.h',
           ]
         }],
-        ['enable_language_detection==1', {
-          'dependencies': [
-            '../third_party/cld/cld.gyp:cld',
-          ],
-        }],
       ],
       'target_conditions': [
         ['OS == "ios"', {

chrome/chrome_tests_unit.gypi

@@ -2498,11 +2498,6 @@
             ['exclude', '^browser/themes/'],
           ],
         }],
-        ['enable_language_detection==0', {
-          'sources!': [
-            'browser/language_usage_metrics_unittest.cc',
-          ],
-        }],
         ['toolkit_views==1', {
           'dependencies': [
             '../ui/views/views.gyp:views',

chrome/common/translate/language_detection_util.cc

@@ -11,11 +11,8 @@
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/translate/translate_common_metrics.h"
 #include "chrome/common/translate/translate_util.h"
-
-#if defined(ENABLE_LANGUAGE_DETECTION)
 #include "third_party/cld/encodings/compact_lang_det/compact_lang_det.h"
 #include "third_party/cld/encodings/compact_lang_det/win/cld_unicodetext.h"
-#endif
 
 namespace {
 
@@ -64,7 +61,6 @@ void ApplyLanguageCodeCorrection(std::string* code) {
   TranslateUtil::ToTranslateLanguageSynonym(code);
 }
 
-#if defined(ENABLE_LANGUAGE_DETECTION)
 // Returns the ISO 639 language code of the specified |text|, or 'unknown' if it
 // failed.
 // |is_cld_reliable| will be set as true if CLD says the detection is reliable.
@@ -100,7 +96,6 @@ std::string DetermineTextLanguage(const base::string16& text,
           << "\n*************************************\n";
   return language;
 }
-#endif  // defined(ENABLE_LANGUAGE_DETECTION)
 
 // Checks if CLD can complement a sub code when the page language doesn't know
 // the sub code.
@@ -122,7 +117,6 @@ std::string DeterminePageLanguage(const std::string& code,
                                   const base::string16& contents,
                                   std::string* cld_language_p,
                                   bool* is_cld_reliable_p) {
-#if defined(ENABLE_LANGUAGE_DETECTION)
   base::TimeTicks begin_time = base::TimeTicks::Now();
   bool is_cld_reliable;
   std::string cld_language = DetermineTextLanguage(contents, &is_cld_reliable);
@@ -134,7 +128,6 @@ std::string DeterminePageLanguage(const std::string& code,
   if (is_cld_reliable_p != NULL)
     *is_cld_reliable_p = is_cld_reliable;
   TranslateUtil::ToTranslateLanguageSynonym(&cld_language);
-#endif  // defined(ENABLE_LANGUAGE_DETECTION)
 
   // Check if html lang attribute is valid.
   std::string modified_html_lang;
@@ -158,7 +151,6 @@ std::string DeterminePageLanguage(const std::string& code,
   std::string language = modified_html_lang.empty() ? modified_code :
                                                       modified_html_lang;
 
-#if defined(ENABLE_LANGUAGE_DETECTION)
   // If |language| is empty, just use CLD result even though it might be
   // chrome::kUnknownLanguageCode.
   if (language.empty()) {
@@ -192,10 +184,6 @@ std::string DeterminePageLanguage(const std::string& code,
     // gives up suggesting a translation.
     return std::string(chrome::kUnknownLanguageCode);
   }
-#else  // defined(ENABLE_LANGUAGE_DETECTION)
-  TranslateCommonMetrics::ReportLanguageVerification(
-      TranslateCommonMetrics::LANGUAGE_VERIFICATION_CLD_DISABLED);
-#endif  // defined(ENABLE_LANGUAGE_DETECTION)
 
   return language;
 }
@@ -303,11 +291,7 @@ bool MaybeServerWrongConfiguration(const std::string& page_language,
 }
 
 std::string GetCLDVersion() {
-#if defined(ENABLE_LANGUAGE_DETECTION)
   return CompactLangDet::DetectLanguageVersion();
-#else
-  return ""
-#endif
 }
 
 }  // namespace LanguageDetectionUtil

chrome/common/translate/translate_common_metrics.cc

@@ -122,14 +122,10 @@ void ReportPageScheme(const std::string& scheme) {
   UMA_HISTOGRAM_ENUMERATION(kTranslatePageScheme, type, SCHEME_MAX);
 }
 
-#if defined(ENABLE_LANGUAGE_DETECTION)
-
 void ReportLanguageDetectionTime(base::TimeTicks begin, base::TimeTicks end) {
   UMA_HISTOGRAM_MEDIUM_TIMES(kRenderer4LanguageDetection, end - begin);
 }
 
-#endif  // defined(ENABLE_LANGUAGE_DETECTION)
-
 void ReportSimilarLanguageMatch(bool match) {
   UMA_HISTOGRAM_BOOLEAN(kTranslateSimilarLanguageMatch, match);
 }

chrome/common/translate/translate_common_metrics.h

@@ -39,7 +39,7 @@ enum LanguageCheckType {
 // When a valid Content-Language is provided, TranslateHelper checks if a
 // server provided Content-Language matches to a language CLD determined.
 enum LanguageVerificationType {
-  LANGUAGE_VERIFICATION_CLD_DISABLED,
+  LANGUAGE_VERIFICATION_CLD_DISABLED,  // obsolete
   LANGUAGE_VERIFICATION_CLD_ONLY,
   LANGUAGE_VERIFICATION_UNKNOWN,
   LANGUAGE_VERIFICATION_CLD_AGREE,
@@ -89,13 +89,9 @@ void ReportUserActionDuration(base::TimeTicks begin, base::TimeTicks end);
 // Called when a translation is triggered.
 void ReportPageScheme(const std::string& scheme);
 
-#if defined(ENABLE_LANGUAGE_DETECTION)
-
 // Called when CLD detects page language.
 void ReportLanguageDetectionTime(base::TimeTicks begin, base::TimeTicks end);
 
-#endif  // defined(ENABLE_LANGUAGE_DETECTION)
-
 // Called when CLD agreed on a language which is different, but in the similar
 // language list.
 void ReportSimilarLanguageMatch(bool match);

chrome/common/translate/translate_common_metrics_unittest.cc

@@ -288,8 +288,6 @@ TEST(TranslateCommonMetricsTest, ReportSimilarLanguageMatch) {
   EXPECT_EQ(1, recorder.GetCount(kFalse));
 }
 
-#if defined(ENABLE_LANGUAGE_DETECTION)
-
 TEST(TranslateCommonMetricsTest, ReportLanguageDetectionTime) {
   MetricsRecorder recorder(TranslateCommonMetrics::GetMetricsName(
       TranslateCommonMetrics::UMA_LANGUAGE_DETECTION));
@@ -300,5 +298,3 @@ TEST(TranslateCommonMetricsTest, ReportLanguageDetectionTime) {
   recorder.CheckValueInLogs(9.009);
   recorder.CheckTotalCount(1);
 }
-
-#endif  // defined(ENABLE_LANGUAGE_DETECTION)