Merge 36552 - Reland r36541 (which went in without any commit log by some mag...

chrome/chrome_tests.gypi

 # Copyright (c) 2009 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.
 
 {
   'variables' : {
     'browser_tests_sources_views_specific': [
       'browser/extensions/browser_action_test_util_views.cc',
       'browser/views/find_bar_host_browsertest.cc',
     ],
@@ skipping 474 matching lines @@
         '../app/app.gyp:app_resources',
         '../ipc/ipc.gyp:ipc',
         '../net/net.gyp:net_resources',
         '../net/net.gyp:net_test_support',
         '../printing/printing.gyp:printing',
         '../webkit/webkit.gyp:webkit_resources',
         '../skia/skia.gyp:skia',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
         '../third_party/bzip2/bzip2.gyp:bzip2',
+        '../third_party/cld/cld.gyp:cld',
         '../third_party/icu/icu.gyp:icui18n',
         '../third_party/icu/icu.gyp:icuuc',
         '../third_party/libxml/libxml.gyp:libxml',
         '../third_party/npapi/npapi.gyp:npapi',
         '../third_party/WebKit/WebKit/chromium/WebKit.gyp:webkit',
       ],
       'include_dirs': [
         '..',
         '../third_party/cld',
       ],
@@ skipping 384 matching lines @@
           'dependencies': [
             '../build/linux/system.gyp:gtk',
             '../build/linux/system.gyp:nss',
             '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
           ],
           'sources': [
             'browser/renderer_host/gtk_key_bindings_handler_unittest.cc',
           ],
           'sources!': [
             'browser/views/bookmark_context_menu_test.cc',
-            # Compact Language Detection (cld) is not supported in linux yet.
-            '../third_party/cld/bar/toolbar/cld/i18n/encodings/compact_lang_det/compact_lang_det_unittest_small.cc',
           ],
         }],
         ['OS=="linux" and (toolkit_views==1 or chromeos==1)', {
           'dependencies': [
             '../views/views.gyp:views',
           ],
           'sources': [
             '<@(views_unit_tests_sources)',
           ],
           # We must use 'sources/' instead of 'source!' as there is a
@@ skipping 29 matching lines @@
             '../third_party/GTM/AppKit',
           ],
           'sources!': [
             'browser/views/bookmark_context_menu_test.cc',
             'browser/back_forward_menu_model_unittest.cc',
             'browser/gtk/go_button_gtk_unittest.cc',
             'browser/gtk/tabs/tab_renderer_gtk_unittest.cc',
             'browser/tab_contents/navigation_controller_unittest.cc',
             'browser/task_manager_unittest.cc',
             '../third_party/hunspell/google/hunspell_tests.cc',
-
-            # Compact Language Detection (cld) is not supported in mac yet.
-            '../third_party/cld/bar/toolbar/cld/i18n/encodings/compact_lang_det/compact_lang_det_unittest_small.cc',
           ],
           # TODO(mark): We really want this for all non-static library targets,
           # but when we tried to pull it up to the common.gypi level, it broke
           # other things like the ui, startup, and page_cycler tests. *shrug*
           'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']},
         }, { # OS != "mac"
           'dependencies': [
             'convert_dict_lib',
             '../third_party/hunspell/hunspell.gyp:hunspell',
           ],
@@ skipping 901 matching lines @@
       ]
     }],  # 'coverage!=0'
   ],  # 'conditions'
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: