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

trunk/src/chrome/chrome_common.gypi

 # Copyright (c) 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.
 
 {
   'targets': [
     {
       'target_name': 'common',
       'type': 'static_library',
       'variables': {
         'chrome_common_target': 1,
         'enable_wexit_time_destructors': 1,
       },
       'include_dirs': [
           '..',
           '<(SHARED_INTERMEDIATE_DIR)',  # Needed by chrome_content_client.cc.
         ],
       'direct_dependent_settings': {
         'include_dirs': [
           '..',
         ],
       },
       'dependencies': [
         # 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',
         'metrics_proto',
         '<(DEPTH)/base/base.gyp:base',
         '<(DEPTH)/base/base.gyp:base_i18n',
         '<(DEPTH)/base/base.gyp:base_prefs',
         '<(DEPTH)/base/base.gyp:base_static',
         '<(DEPTH)/chrome/chrome_resources.gyp:chrome_resources',
         '<(DEPTH)/chrome/chrome_resources.gyp:chrome_strings',
@@ skipping 622 matching lines @@
           'sources!': [
             'common/media/webrtc_logging_messages.h',
           ]
         }],
         ['enable_printing==0', {
           'sources!': [
             'common/print_messages.cc',
             'common/print_messages.h',
           ]
         }],
-        ['cld_version==0 or cld_version==1', {
-          'dependencies': [
-            '<(DEPTH)/third_party/cld/cld.gyp:cld',
-          ],
-        }],
-        ['cld_version==0 or cld_version==2', {
-          'dependencies': [
-            '<(DEPTH)/third_party/cld_2/cld_2.gyp:cld_2',
-          ],
-        }],
       ],
       'target_conditions': [
         ['OS == "ios"', {
           'sources/': [
             # Pull in specific Mac files for iOS (which have been filtered out
             # by file name rules).
             ['include', '^common/chrome_version_info_mac\\.mm$'],
             ['include', '^common/mac/nscoder_util\\.'],
           ],
         }],
@@ skipping 171 matching lines @@
         'common/metrics/proto/user_action_event.proto',
       ],
       'variables': {
         'proto_in_dir': 'common/metrics/proto',
         'proto_out_dir': 'chrome/common/metrics/proto',
       },
       'includes': [ '../build/protoc.gypi' ],
     },
   ],
 }