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

trunk/src/chrome/chrome_dll.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.
 {
   'conditions': [
     ['OS=="mac" or OS=="win"', {
       'targets': [
         {
           'target_name': 'chrome_dll',
           'type': 'none',
@@ skipping 89 matching lines @@
               'product_name': 'chrome',
               'dependencies': [
                 # On Windows, link the dependencies (libraries) that make
                 # up actual Chromium functionality into this .dll.
                 'chrome_dll_pdb_workaround',
                 'chrome_version_resources',
                 '../chrome/chrome_resources.gyp:chrome_unscaled_resources',
                 '../crypto/crypto.gyp:crypto',
                 '../printing/printing.gyp:printing',
                 '../net/net.gyp:net_resources',
+                '../third_party/cld/cld.gyp:cld',
                 '../ui/views/views.gyp:views',
                 '../webkit/webkit_resources.gyp:webkit_resources',
               ],
               'sources': [
                 'app/chrome_command_ids.h',
                 'app/chrome_dll.rc',
                 'app/chrome_dll_resource.h',
                 'app/chrome_main.cc',
                 'app/chrome_main_delegate.cc',
                 'app/chrome_main_delegate.h',
@@ skipping 105 matching lines @@
             }, {
               'dependencies': [
                 '<@(chromium_child_dependencies)',
                 '../content/content.gyp:content_app_both',
                 '../content/content.gyp:content_worker',
               ],
               'dependencies!': [
                 '../content/content.gyp:content_app_browser',
               ],
             }],
-            ['cld_version==0 or cld_version==1', {
-              'dependencies': [
-                '../third_party/cld/cld.gyp:cld',
-              ],
-            }],
-            ['cld_version==0 or cld_version==2', {
-              'dependencies': [
-                '../third_party/cld_2/cld_2.gyp:cld_2',
-              ],
-            }],
             ['OS=="mac" and component!="shared_library"', {
               'includes': [ 'chrome_dll_bundle.gypi' ],
             }],
             ['OS=="mac" and component=="shared_library"', {
               'xcode_settings': { 'OTHER_LDFLAGS': [ '-Wl,-ObjC' ], },
             }],
             ['OS=="mac"', {
               'xcode_settings': {
                 # Define the order of symbols within the framework.  This
                 # sets -order_file.
@@ skipping 110 matching lines @@
             '<(SHARED_INTERMEDIATE_DIR)/chrome_version/chrome_dll_version.rc',
             'app/chrome_main.cc',
             'app/chrome_main_delegate.cc',
             'app/chrome_main_delegate.h',
           ],
         },  # target chrome_child_dll
       ],
     }],
   ],
 }