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

components/components_tests.gyp

 # Copyright 2014 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': {
     # This turns on e.g. the filename-based detection of which
     # platforms to include source files on (e.g. files ending in
     # _mac.h or _mac.cc are only compiled on MacOSX).
     'chromium_code': 1,
@@ skipping 436 matching lines @@
             # Dependencies of variations
             'components.gyp:variations',
             'components.gyp:variations_http_provider',
           ],
           'conditions': [
             ['toolkit_views == 1', {
               'sources': [
                 'bookmarks/browser/bookmark_node_data_unittest.cc',
               ],
             }],
+            [ 'cld_version==2', {
+              'dependencies': [
+                # Unit tests should always use statically-linked CLD data.
+                '../third_party/cld_2/cld_2.gyp:cld2_static', ],
+            }],
             ['OS != "ios"', {
               'sources': [
                 'autofill/content/renderer/renderer_save_password_progress_logger_unittest.cc',
                 'dom_distiller/content/dom_distiller_viewer_source_unittest.cc',
                 'metrics/gpu/gpu_metrics_provider_unittest.cc',
                 'password_manager/content/browser/content_credential_manager_dispatcher_unittest.cc',
                 'power/origin_power_map_unittest.cc',
               ],
               'dependencies': [
                 # Dependencies of autofill
@@ skipping 509 matching lines @@
               'dependencies': [
                 '../base/allocator/allocator.gyp:allocator',
               ],
             }],
           ],
         },
       ],
     }],
   ],
 }