Remove the Finch test 'CLD1VsCLD2'

The Finch test 'CDL1VsCLD2' is a test to make sure that CLD2 is not
worse than CLD1 in terms of performance or accuracy. This test is no
longer executed on any platforms. Let's remove this for code health.

CLD version '0' is used to represent to use the Finch trial, and this
CL removes the cases of version 0 from gn, gypi and C++ files.

BUG=515358

Review URL: https://codereview.chromium.org/1259883007

Cr-Commit-Position: refs/heads/master@{#341496}

14 files changed, 79 insertions, 116 deletions

diff --git a/build/common.gypi b/build/common.gypi
index 65e8106..052d297 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -556,7 +556,6 @@
       'enable_print_preview%': 1,
 
       # Set the version of CLD.
-      #   0: Don't specify the version. This option is for the Finch testing.
       #   1: Use only CLD1.
       #   2: Use only CLD2.
       'cld_version%': 2,
@@ -2628,6 +2627,7 @@
     'defines': [
       # Don't use deprecated V8 APIs anywhere.
       'V8_DEPRECATION_WARNINGS',
+      'CLD_VERSION=<(cld_version)',
     ],
     'include_dirs': [
       '<(SHARED_INTERMEDIATE_DIR)',
@@ -2994,9 +2994,6 @@
       ['enable_google_now==1', {
         'defines': ['ENABLE_GOOGLE_NOW=1'],
       }],
-      ['cld_version!=0', {
-        'defines': ['CLD_VERSION=<(cld_version)'],
-      }],
       ['enable_basic_printing==1 or enable_print_preview==1', {
         # Convenience define for ENABLE_BASIC_PRINTING || ENABLE_PRINT_PREVIEW.
         'defines': ['ENABLE_PRINTING=1'],
diff --git a/build/config/BUILD.gn b/build/config/BUILD.gn
index 2d1dd1e..60f4d1b 100644
--- a/build/config/BUILD.gn
+++ b/build/config/BUILD.gn
@@ -44,11 +44,10 @@ declare_args() {
 # For now we define these globally to match the current GYP build.
 config("feature_flags") {
   # TODO(brettw) this probably needs to be parameterized.
-  defines = [ "V8_DEPRECATION_WARNINGS" ]  # Don't use deprecated V8 APIs anywhere.
-
-  if (cld_version > 0) {
-    defines += [ "CLD_VERSION=$cld_version" ]
-  }
+  defines = [
+    "V8_DEPRECATION_WARNINGS",  # Don't use deprecated V8 APIs anywhere.
+    "CLD_VERSION=$cld_version",
+  ]
   if (enable_mdns) {
     defines += [ "ENABLE_MDNS=1" ]
   }
diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
index d08933d..280ea3d 100644
--- a/chrome/BUILD.gn
+++ b/chrome/BUILD.gn
@@ -227,7 +227,7 @@ shared_library("main_dll") {
     ]
   }
 
-  if (cld_version == 0 || cld_version == 2) {
+  if (cld_version == 2) {
     deps += [ "//third_party/cld_2" ]
   }
 
@@ -332,7 +332,7 @@ group("child_dependencies") {
       "//third_party/WebKit/public:blink_devtools_frontend_resources",
     ]
   }
-  if (cld_version == 0 || cld_version == 2) {
+  if (cld_version == 2) {
     deps += [ "//third_party/cld_2:cld2_platform_impl" ]
   }
 
diff --git a/chrome/browser/chrome_browser_field_trials.cc b/chrome/browser/chrome_browser_field_trials.cc
index 17b59b0..f9cdd7b 100644
--- a/chrome/browser/chrome_browser_field_trials.cc
+++ b/chrome/browser/chrome_browser_field_trials.cc
@@ -43,7 +43,6 @@ void ChromeBrowserFieldTrials::SetupFieldTrials() {
 void ChromeBrowserFieldTrials::InstantiateDynamicTrials() {
   // The following trials are used from renderer process.
   // Mark here so they will be sync-ed.
-  base::FieldTrialList::FindValue("CLD1VsCLD2");
   base::FieldTrialList::FindValue("DisplayList2dCanvas");
   // Activate the autocomplete dynamic field trials.
   OmniboxFieldTrial::ActivateDynamicTrials();
diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi
index 1630048c..f9ed3d0 100644
--- a/chrome/chrome_dll.gypi
+++ b/chrome/chrome_dll.gypi
@@ -273,7 +273,7 @@
                 '<(DEPTH)/third_party/cld/cld.gyp:cld',
               ],
             }],
-            ['cld_version==0 or cld_version==2', {
+            ['cld_version==2', {
               'dependencies': [
                 '<(DEPTH)/third_party/cld_2/cld_2.gyp:cld_2',
               ],
diff --git a/chrome/chrome_shell.gypi b/chrome/chrome_shell.gypi
index edddbd4..7e2e8f5 100644
--- a/chrome/chrome_shell.gypi
+++ b/chrome/chrome_shell.gypi
@@ -36,7 +36,7 @@
           'dependencies': [
             '../base/allocator/allocator.gyp:allocator', ],
         }],
-        [ 'cld_version==0 or cld_version==2', {
+        [ 'cld_version==2', {
           'dependencies': [
             # Chrome shell should always use the statically-linked CLD data.
             '<(DEPTH)/third_party/cld_2/cld_2.gyp:cld2_static', ],
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index e263909..795debe 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -1573,7 +1573,7 @@
         '<@(chrome_interactive_ui_test_sources)',
       ],
       'conditions': [
-        [ 'cld_version==0 or cld_version==2', {
+        [ 'cld_version==2', {
           'dependencies': [
             # Interactive tests should use whatever CLD2 data access mode that
             # the application embedder is using.
@@ -2139,7 +2139,7 @@
         },
       },
       'conditions': [
-        [ 'cld_version==0 or cld_version==2', {
+        [ 'cld_version==2', {
           'dependencies': [
             # Because the browser_tests use translate, they need CLD data.
             '<(DEPTH)/third_party/cld_2/cld_2.gyp:cld2_platform_impl', ],
@@ -2612,7 +2612,7 @@
         },
       ],
       'conditions': [
-        [ 'cld_version==0 or cld_version==2', {
+        [ 'cld_version==2', {
           'dependencies': [
             # Interactive tests should use whatever CLD2 data access mode that
             # the application embedder is using.
@@ -2799,7 +2799,7 @@
         '<@(sync_integration_tests_sources)',
       ],
       'conditions': [
-        [ 'cld_version==0 or cld_version==2', {
+        [ 'cld_version==2', {
           'dependencies': [
             # Language detection is irrelevant to sync, so it can depend on
             # any implementation for CLD2. Dynamic is smaller, so go with
@@ -2909,7 +2909,7 @@
         '<@(sync_performance_tests_sources)',
       ],
       'conditions': [
-        [ 'cld_version==0 or cld_version==2', {
+        [ 'cld_version==2', {
           'dependencies': [
             # Language detection is irrelevant to sync, so it can depend on
             # any implementation for CLD2. Dynamic is smaller, so go with
diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi
index 08ceae4..d1286d1 100644
--- a/chrome/chrome_tests_unit.gypi
+++ b/chrome/chrome_tests_unit.gypi
@@ -2480,7 +2480,7 @@
             '../ui/events/devices/events_devices.gyp:events_devices',
           ],
         }],
-        [ 'cld_version==0 or cld_version==2', {
+        [ 'cld_version==2', {
           'dependencies': [
             # Unit tests should be independent of the CLD2 access mechanism,
             # just use static for simplicity.
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
index fe2eed8..432b367 100644
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -449,7 +449,7 @@ if (!is_android) {
       ldflags += [ "-Wl,-ObjC" ]
     }
 
-    if (cld_version == 0 || cld_version == 2) {
+    if (cld_version == 2) {
       # Interactive tests should use whatever CLD2 data access mode that the
       # application embedder is using.
       deps += [ "//third_party/cld_2:cld2_platform_impl" ]
@@ -678,7 +678,7 @@ if (!is_android) {
     #         'UseLibraryDependencyInputs': "true",
     # }
 
-    if (cld_version == 0 || cld_version == 2) {
+    if (cld_version == 2) {
       # Because the browser_tests use translate, they need CLD data.
       deps += [ "//third_party/cld_2:cld2_platform_impl" ]
     }
@@ -1077,7 +1077,7 @@ if (!is_android) {
 
     data_deps = [ "//third_party/mesa:osmesa" ]
 
-    if (cld_version == 0 || cld_version == 2) {
+    if (cld_version == 2) {
       # Language detection is irrelevant to sync, so it can depend on any
       # implementation for CLD2. Dynamic is smaller, so go with dynamic.
       deps += [ "//third_party/cld_2:cld2_dynamic" ]
@@ -1148,7 +1148,7 @@ if (!is_android) {
       "//testing/gtest",
     ]
 
-    if (cld_version == 0 || cld_version == 2) {
+    if (cld_version == 2) {
       # Language detection is irrelevant to sync, so it can depend on any
       # implementation for CLD2. Dynamic is smaller, so go with dynamic.
       deps += [ "//third_party/cld_2:cld2_dynamic" ]
@@ -1612,7 +1612,7 @@ if (!is_android) {
     } else {
       sources -= [ "../browser/password_manager/password_store_x_unittest.cc" ]
     }
-    if (cld_version == 0 || cld_version == 2) {
+    if (cld_version == 2) {
       # Unit tests should be independent of the CLD2 access mechanism, just use
       # static for simplicity.
       deps += [ "//third_party/cld_2:cld2_static" ]
@@ -1813,7 +1813,7 @@ if (!is_android) {
         "//base/test:run_all_unittests",
         "//base/test:test_support",
       ]
-      if (cld_version == 0 || cld_version == 2) {
+      if (cld_version == 2) {
         # Use whatever CLD2 data access mode that the
         # application embedder is using.
         deps += [ "//third_party/cld_2:cld2_platform_impl" ]
@@ -1860,7 +1860,7 @@ if (!is_android) {
         sources -= [ "perf/mach_ports_performancetest.cc" ]
       }
 
-      if (cld_version == 0 || cld_version == 2) {
+      if (cld_version == 2) {
         # Use whatever CLD2 data access mode that the
         # application embedder is using.
         deps += [ "//third_party/cld_2:cld2_platform_impl" ]
diff --git a/components/components_tests.gyp b/components/components_tests.gyp
index 75943fb..018fc1a 100644
--- a/components/components_tests.gyp
+++ b/components/components_tests.gyp
@@ -932,7 +932,7 @@
             '<(DEPTH)/base/allocator/allocator.gyp:allocator',
           ],
         }],
-        [ 'cld_version==0 or cld_version==2', {
+        [ 'cld_version==2', {
           'dependencies': [
             # Unit tests should always use statically-linked CLD data.
             '<(DEPTH)/third_party/cld_2/cld_2.gyp:cld2_static', ],
diff --git a/components/translate.gypi b/components/translate.gypi
index c003e3e..066bad0 100644
--- a/components/translate.gypi
+++ b/components/translate.gypi
@@ -113,7 +113,7 @@
             '<(DEPTH)/third_party/cld/cld.gyp:cld',
           ],
         }],
-        ['cld_version==0 or cld_version==2', {
+        ['cld_version==2', {
           'dependencies': [
             '<(DEPTH)/third_party/cld_2/cld_2.gyp:cld_2',
           ],
@@ -207,7 +207,7 @@
             'translate/content/renderer/translate_helper.h',
            ],
           'conditions': [
-            ['cld_version==0 or cld_version==2', {
+            ['cld_version==2', {
               'dependencies': [
                 '<(DEPTH)/third_party/cld_2/cld_2.gyp:cld_2',
               ],
diff --git a/components/translate/content/renderer/BUILD.gn b/components/translate/content/renderer/BUILD.gn
index 3a82f2a..1ce88da 100644
--- a/components/translate/content/renderer/BUILD.gn
+++ b/components/translate/content/renderer/BUILD.gn
@@ -31,7 +31,7 @@ static_library("renderer") {
     "//v8",
   ]
 
-  if (cld_version == 0 || cld_version == 2) {
+  if (cld_version == 2) {
     deps += [ "//third_party/cld_2" ]
   }
 }
diff --git a/components/translate/core/language_detection/BUILD.gn b/components/translate/core/language_detection/BUILD.gn
index f704844..57e1d10 100644
--- a/components/translate/core/language_detection/BUILD.gn
+++ b/components/translate/core/language_detection/BUILD.gn
@@ -16,10 +16,10 @@ static_library("language_detection") {
     "//url",
   ]
 
-  if (cld_version == 0 || cld_version == 1) {
+  if (cld_version == 1) {
     deps += [ "//third_party/cld" ]
   }
-  if (cld_version == 0 || cld_version == 2) {
+  if (cld_version == 2) {
     deps += [ "//third_party/cld_2" ]
   }
 }
diff --git a/components/translate/core/language_detection/language_detection_util.cc b/components/translate/core/language_detection/language_detection_util.cc
index 5c751a7..4ab86fc 100644
--- a/components/translate/core/language_detection/language_detection_util.cc
+++ b/components/translate/core/language_detection/language_detection_util.cc
@@ -5,7 +5,6 @@
 #include "components/translate/core/language_detection/language_detection_util.h"
 
 #include "base/logging.h"
-#include "base/metrics/field_trial.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
@@ -14,12 +13,12 @@
 #include "components/translate/core/common/translate_metrics.h"
 #include "components/translate/core/common/translate_util.h"
 
-#if !defined(CLD_VERSION) || CLD_VERSION==1
+#if CLD_VERSION==1
 #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
 
-#if !defined(CLD_VERSION) || CLD_VERSION==2
+#if CLD_VERSION==2
 #include "third_party/cld_2/src/public/compact_lang_det.h"
 #endif
 
@@ -70,18 +69,6 @@ void ApplyLanguageCodeCorrection(std::string* code) {
   translate::ToTranslateLanguageSynonym(code);
 }
 
-int GetCLDMajorVersion() {
-#if !defined(CLD_VERSION)
-  std::string group_name = base::FieldTrialList::FindFullName("CLD1VsCLD2");
-  if (group_name == "CLD2")
-    return 2;
-  else
-    return 1;
-#else
-  return CLD_VERSION;
-#endif
-}
-
 // 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.
@@ -96,45 +83,36 @@ std::string DetermineTextLanguage(const base::string16& text,
   int cld_language = 0;
   bool is_valid_language = false;
 
-  switch (GetCLDMajorVersion()) {
-#if !defined(CLD_VERSION) || CLD_VERSION==1
-    case 1: {
-      int num_languages = 0;
-      cld_language = DetectLanguageOfUnicodeText(
-          NULL, text.c_str(), is_plain_text, &is_reliable, &num_languages, NULL,
-          &num_bytes_evaluated);
-      is_valid_language = cld_language != NUM_LANGUAGES &&
-          cld_language != UNKNOWN_LANGUAGE &&
-          cld_language != TG_UNKNOWN_LANGUAGE;
-      break;
-    }
-#endif
-#if !defined(CLD_VERSION) || CLD_VERSION==2
-    case 2: {
-      const std::string utf8_text(base::UTF16ToUTF8(text));
-      const int num_utf8_bytes = static_cast<int>(utf8_text.size());
-      const char* raw_utf8_bytes = utf8_text.c_str();
-      cld_language = CLD2::DetectLanguageCheckUTF8(
-          raw_utf8_bytes, num_utf8_bytes, is_plain_text, &is_reliable,
-          &num_bytes_evaluated);
-
-      if (num_bytes_evaluated < num_utf8_bytes &&
-          cld_language == CLD2::UNKNOWN_LANGUAGE) {
-        // Invalid UTF8 encountered, see bug http://crbug.com/444258.
-        // Retry using only the valid characters. This time the check for valid
-        // UTF8 can be skipped since the precise number of valid bytes is known.
-        cld_language = CLD2::DetectLanguage(raw_utf8_bytes, num_bytes_evaluated,
-                                            is_plain_text, &is_reliable);
-      }
-      is_valid_language = cld_language != CLD2::NUM_LANGUAGES &&
-          cld_language != CLD2::UNKNOWN_LANGUAGE &&
-          cld_language != CLD2::TG_UNKNOWN_LANGUAGE;
-      break;
-    }
-#endif
-    default:
-      NOTREACHED();
+#if CLD_VERSION==1
+  int num_languages = 0;
+  cld_language = DetectLanguageOfUnicodeText(
+      NULL, text.c_str(), is_plain_text, &is_reliable, &num_languages, NULL,
+      &num_bytes_evaluated);
+  is_valid_language = cld_language != NUM_LANGUAGES &&
+      cld_language != UNKNOWN_LANGUAGE &&
+      cld_language != TG_UNKNOWN_LANGUAGE;
+#elif CLD_VERSION==2
+  const std::string utf8_text(base::UTF16ToUTF8(text));
+  const int num_utf8_bytes = static_cast<int>(utf8_text.size());
+  const char* raw_utf8_bytes = utf8_text.c_str();
+  cld_language = CLD2::DetectLanguageCheckUTF8(
+      raw_utf8_bytes, num_utf8_bytes, is_plain_text, &is_reliable,
+      &num_bytes_evaluated);
+
+  if (num_bytes_evaluated < num_utf8_bytes &&
+      cld_language == CLD2::UNKNOWN_LANGUAGE) {
+    // Invalid UTF8 encountered, see bug http://crbug.com/444258.
+    // Retry using only the valid characters. This time the check for valid
+    // UTF8 can be skipped since the precise number of valid bytes is known.
+    cld_language = CLD2::DetectLanguage(raw_utf8_bytes, num_bytes_evaluated,
+                                        is_plain_text, &is_reliable);
   }
+  is_valid_language = cld_language != CLD2::NUM_LANGUAGES &&
+      cld_language != CLD2::UNKNOWN_LANGUAGE &&
+      cld_language != CLD2::TG_UNKNOWN_LANGUAGE;
+#else
+# error "CLD_VERSION must be 1 or 2"
+#endif
 
   if (is_cld_reliable != NULL)
     *is_cld_reliable = is_reliable;
@@ -152,37 +130,27 @@ std::string DetermineTextLanguage(const base::string16& text,
     // |LanguageCodeWithDialect| will go through ISO 639-1, ISO-639-2 and
     // 'other' tables to do the 'right' thing. In addition, it'll return zh-CN
     // for Simplified Chinese.
-    switch (GetCLDMajorVersion()) {
-#if !defined(CLD_VERSION) || CLD_VERSION==1
-      case 1:
-        language =
-            LanguageCodeWithDialects(static_cast<Language>(cld_language));
-        break;
-#endif
-#if !defined(CLD_VERSION) || CLD_VERSION==2
-      case 2:
-        // (1) CLD2's LanguageCode returns general Chinese 'zh' for
-        // CLD2::CHINESE, but Translate server doesn't accept it. This is
-        // converted to 'zh-CN' in the same way as CLD1's
-        // LanguageCodeWithDialects.
-        //
-        // (2) CLD2's LanguageCode returns zh-Hant instead of zh-TW for
-        // CLD2::CHINESE_T. This is technically more precise for the language
-        // code of traditional Chinese, while Translate server hasn't accepted
-        // zh-Hant yet.
-        if (cld_language == CLD2::CHINESE) {
-          language = "zh-CN";
-        } else if (cld_language == CLD2::CHINESE_T) {
-          language = "zh-TW";
-        } else {
-          language =
-              CLD2::LanguageCode(static_cast<CLD2::Language>(cld_language));
-        }
-        break;
+#if CLD_VERSION==1
+    language = LanguageCodeWithDialects(static_cast<Language>(cld_language));
+#elif CLD_VERSION==2
+    // (1) CLD2's LanguageCode returns general Chinese 'zh' for
+    // CLD2::CHINESE, but Translate server doesn't accept it. This is
+    // converted to 'zh-CN' in the same way as CLD1's
+    // LanguageCodeWithDialects.
+    //
+    // (2) CLD2's LanguageCode returns zh-Hant instead of zh-TW for
+    // CLD2::CHINESE_T. This is technically more precise for the language
+    // code of traditional Chinese, while Translate server hasn't accepted
+    // zh-Hant yet.
+    if (cld_language == CLD2::CHINESE)
+      language = "zh-CN";
+    else if (cld_language == CLD2::CHINESE_T)
+      language = "zh-TW";
+    else
+      language = CLD2::LanguageCode(static_cast<CLD2::Language>(cld_language));
+#else
+# error "CLD_VERSION must be 1 or 2"
 #endif
-      default:
-        NOTREACHED();
-    }
   }
   VLOG(9) << "Detected lang_id: " << language << ", from Text:\n" << text
           << "\n*************************************\n";