Revert 221380 "Use Finch to compare the performances of CLD1 and..."

trunk/src/chrome/chrome_tests_unit.gypi

 # Copyright 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.
 {
   'targets': [
     {
       # This target contains mocks and test utilities that don't belong in
       # production libraries but are used by more than one test executable.
       'target_name': 'test_support_common',
       'type': 'static_library',
@@ skipping 469 matching lines @@
         'chrome_resources.gyp:chrome_strings',
       ],
       # TODO(joi): Remove this section once the google_apis tests are
       # a separate unit test binary.
       'includes': [
         '../google_apis/determine_use_official_keys.gypi',
       ],
       'include_dirs': [
         '..',
       ],
+      'defines': [
+        'CLD_WINDOWS',
+      ],
+      'direct_dependent_settings': {
+        'defines': [
+          'CLD_WINDOWS',
+        ],
+      },
       'msvs_settings': {
         'VCLinkerTool': {
           'conditions': [
             ['incremental_chrome_dll==1', {
               'UseLibraryDependencyInputs': "true",
             }],
           ],
         },
       },
       'sources': [
@@ skipping 1425 matching lines @@
         '../skia/ext/convolver_unittest.cc',
         '../skia/ext/image_operations_unittest.cc',
         '../skia/ext/lazy_pixel_ref_utils_unittest.cc',
         '../skia/ext/platform_canvas_unittest.cc',
         '../skia/ext/recursive_gaussian_convolution_unittest.cc',
         '../skia/ext/refptr_unittest.cc',
         '../skia/ext/skia_utils_ios_unittest.mm',
         '../skia/ext/skia_utils_mac_unittest.mm',
         '../skia/ext/vector_canvas_unittest.cc',
         '../testing/gtest_mac_unittest.mm',
+        '../third_party/cld/encodings/compact_lang_det/compact_lang_det_unittest_small.cc',
         '../third_party/zlib/google/zip_reader_unittest.cc',
         '../third_party/zlib/google/zip_unittest.cc',
         '../tools/json_schema_compiler/test/additional_properties_unittest.cc',
         '../tools/json_schema_compiler/test/any_unittest.cc',
         '../tools/json_schema_compiler/test/arrays_unittest.cc',
         '../tools/json_schema_compiler/test/callbacks_unittest.cc',
         '../tools/json_schema_compiler/test/choices_unittest.cc',
         '../tools/json_schema_compiler/test/crossref_unittest.cc',
         '../tools/json_schema_compiler/test/enums_unittest.cc',
         '../tools/json_schema_compiler/test/functions_as_parameters_unittest.cc',
@@ skipping 17 matching lines @@
       'conditions': [
         ['OS!="ios"', {
           'dependencies': [
             'common/extensions/api/api.gyp:api',
             '../components/components.gyp:autofill_content_test_support',
             '../components/component_strings.gyp:component_strings',
             '../device/bluetooth/bluetooth.gyp:device_bluetooth_mocks',
             '../gpu/gpu.gyp:gpu_unittest_utils',
             '../media/media.gyp:media_test_support',
             '../ppapi/ppapi_internal.gyp:ppapi_unittest_shared',
+            '../third_party/cld/cld.gyp:cld',
             '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
             '../third_party/libjingle/libjingle.gyp:libjingle',
             '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber',
             '../tools/json_schema_compiler/test/json_schema_compiler_tests.gyp:json_schema_compiler_tests',
             '../ui/gl/gl.gyp:gl',
             '../v8/tools/gyp/v8.gyp:v8',
             '../webkit/webkit_resources.gyp:webkit_resources',
           ],
           # TODO(scr): Use this in browser_tests too.
           'includes': [
@@ skipping 636 matching lines @@
         ['enable_managed_users!=1', {
           'sources/': [
             ['exclude', '^browser/managed_mode/'],
           ],
         }],
         ['safe_browsing!=1', {
           'sources/': [
             ['exclude', '^browser/extensions/blacklist_unittest.cc'],
           ],
         }],
-        ['cld_version==0 or cld_version==1', {
-          'defines': [
-            'CLD_WINDOWS',
-          ],
-          'direct_dependent_settings': {
-            'defines': [
-              'CLD_WINDOWS',
-            ],
-          },
-          'sources': [
-            '../third_party/cld/encodings/compact_lang_det/compact_lang_det_unittest_small.cc',
-          ],
-          'dependencies': [
-            '../third_party/cld/cld.gyp:cld',
-          ],
-        }],
       ],
       'target_conditions': [
         ['OS == "ios"', {
           'sources/': [
             ['include', '^common/mac/nscoder_util_unittest\\.mm$'],
           ],
         }],
       ],
     },
     {
@@ skipping 107 matching lines @@
               # more details.
               'DebugInformationFormat': '3',
               'ProgramDataBaseFileName': '<(PRODUCT_DIR)/unit_tests.exe.pdb',
             },
           },
         },
       ],
     }],
   ],  # 'conditions'
 }