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

chrome/chrome_shell.gypi

 # 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.
 
 # This GYPI allows independent customization of the chrome shell in a manner
 # similar to content shell (in content_shell.gypi). Notably, this file does
 # NOT contain chrome_android_core, which is independent of the chrome shell
 # and should be separately customized.
 {
   'variables': {
@@ skipping 22 matching lines @@
           'conditions': [
             [ 'OS=="android"', {
               'dependencies': [ '../tools/cygprofile/cygprofile.gyp:cygprofile', ],
             }],
           ],
         }],
         [ 'use_allocator!="none"', {
           'dependencies': [
             '../base/allocator/allocator.gyp:allocator', ],
         }],
+        [ 'cld_version==0 or cld_version==2', {
+          'dependencies': [
+            # Chrome shell should always use the statically-linked CLD data.
+            '<(DEPTH)/third_party/cld_2/cld_2.gyp:cld2_static', ],
+        }],
         ['OS=="android"', {
           'direct_dependent_settings': {
             'ldflags': [
               # Some android targets still depend on --gc-sections to link.
               # TODO: remove --gc-sections for Debug builds (crbug.com/159847).
               '-Wl,--gc-sections',
             ],
           },
         }],
       ],
@@ skipping 130 matching lines @@
       'target_name': 'chrome_sync_shell_apk_java',
       'type': 'none',
       'dependencies': [
         'chrome_sync_shell_apk',
       ],
       'includes': [ '../build/apk_fake_jar.gypi' ],
     },
   ],
 
 }