Refactor language detection logic to allow non-static CLD data sources.

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.
 {
   'variables': {
     'chrome_unit_tests_sources': [
       '../apps/saved_files_service_unittest.cc',
       '../components/autofill/content/renderer/test_password_autofill_agent.cc',
       '../components/autofill/content/renderer/test_password_autofill_agent.h',
       '../components/autofill/content/renderer/test_password_generation_agent.cc',
@@ skipping 2322 matching lines @@
             # this is broken.
             'browser/ui/views/frame/immersive_mode_controller_ash_unittest.cc',
             'browser/ui/views/select_file_dialog_extension_unittest.cc',
           ],
         }],
         ['use_x11==1', {
           'dependencies': [
             '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
           ],
         }],
+        [ 'cld_version==0 or cld_version==2', {
+          'dependencies': [
+            # Unit tests should be independent of the CLD2 access mechanism,
+            # just use static for simplicity.
+            '<(DEPTH)/third_party/cld_2/cld_2.gyp:cld2_static', ],
+        }],
         ['OS=="linux"', {
           'dependencies': [
             '../build/linux/system.gyp:ssl',
           ],
         }],
         # Only add this test for 64 bit builds because otherwise we need the 32
         # bit library on 64 bit systems when running this test.
         ['use_gnome_keyring == 1 and target_arch=="x64"', {
           'sources': [
             'browser/password_manager/native_backend_gnome_x_unittest.cc',
@@ skipping 371 matching lines @@
         ['enable_managed_users!=1', {
           'sources/': [
             ['exclude', '^browser/supervised_user/'],
           ],
         }],
         ['safe_browsing==1 and enable_extensions==1', {
           'sources': [
             'browser/extensions/blacklist_unittest.cc',
           ],
         }],
-        ['cld_version==0 or cld_version==1', {
+        ['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',
@@ skipping 161 matching lines @@
               'dependencies': [
                 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
               ],
             }],
           ],
         },
       ],
     }],
   ],  # 'conditions'
 }