Remove the Finch test 'CLD1VsCLD2'

build/common.gypi

 # Copyright (c) 2012 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.
 
 # IMPORTANT:
 # Please don't directly include this file if you are building via gyp_chromium,
 # since gyp_chromium is automatically forcing its inclusion.
 {
   # Variables expected to be overriden on the GYP command line (-D) or by
   # ~/.gyp/include.gypi.
@@ skipping 538 matching lines @@
       'enable_google_now%': 1,
 
       # Enable basic printing support and UI.
       'enable_basic_printing%': 1,
 
       # Enable printing with print preview. It does not imply
       # enable_basic_printing. It's possible to build Chrome with preview only.
       '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,
 
       # For CLD2, the size of the tables that should be included in the build
       # Only evaluated if cld_version == 2 or if building the CLD2 dynamic data
       # tool explicitly.
       # See third_party/cld_2/cld_2.gyp for more information.
       #   0: Small tables, lower accuracy
       #   2: Large tables, high accuracy
@@ skipping 2051 matching lines @@
         '-Wno-inconsistent-missing-override',
 
         # TODO(thakis): Enable this, crbug.com/507717
         '-Wno-shift-negative-value',
       ],
     },
     'includes': [ 'set_clang_warning_flags.gypi', ],
     'defines': [
       # Don't use deprecated V8 APIs anywhere.
       'V8_DEPRECATION_WARNINGS',
+      'CLD_VERSION=<(cld_version)',
     ],
     'include_dirs': [
       '<(SHARED_INTERMEDIATE_DIR)',
     ],
     'conditions': [
       ['OS=="mac"', {
         # When compiling Objective C, warns if a method is used whose
         # availability is newer than the deployment target.
         'xcode_settings': { 'WARNING_CFLAGS': ['-Wpartial-availability']},
       }],
@@ skipping 346 matching lines @@
         # In GN, this is set on the autofill tagets only. See
         # //components/autofill/core/browser:wallet_service
         'defines': ['ENABLE_PROD_WALLET_SERVICE=1'],
       }],
       ['enable_background==1', {
         'defines': ['ENABLE_BACKGROUND=1'],
       }],
       ['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'],
       }],
       ['enable_basic_printing==1', {
         # Enable basic printing support and UI.
         'defines': ['ENABLE_BASIC_PRINTING=1'],
       }],
       ['enable_print_preview==1', {
         # Enable printing with print preview.
@@ skipping 3284 matching lines @@
     # settings in target dicts.  SYMROOT is a special case, because many other
     # Xcode variables depend on it, including variables such as
     # PROJECT_DERIVED_FILE_DIR.  When a source group corresponding to something
     # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
     # files to appear (when present) in the UI as actual files and not red
     # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
     # and therefore SYMROOT, needs to be set at the project level.
     'SYMROOT': '<(DEPTH)/xcodebuild',
   },
 }