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

chrome/chrome.gyp

 # 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.
 {
   'variables': {
     'chromium_code': 1,
 
     # Define the common dependencies that contain all the actual
     # Chromium functionality.  This list gets pulled in below by
     # the link of the actual chrome (or chromium) executable on
@@ skipping 21 matching lines @@
           '../ppapi/ppapi_internal.gyp:ppapi_host',
         ],
         'chromium_child_dependencies': [
           'plugin',
           'renderer',
           'utility',
           '../content/content.gyp:content_gpu',
           '../content/content.gyp:content_ppapi_plugin',
           '../third_party/WebKit/public/blink_devtools.gyp:blink_devtools_frontend_resources',
         ],
+        'conditions': [
+          [ 'cld_version==2', {
+            'chromium_child_dependencies': [
+              # Use whatever CLD2 data access mode that the application
+              # embedder is using.
+              '../third_party/cld_2/cld_2.gyp:cld2_platform_impl', ],
+          }],

[picksi1, 2014/10/30 17:37:32]

as above, does this also need to have a check for cld_version 0?

[Andrew Hayden (chromium.org), 2014/10/30 17:51:13]

It should, yes.

[Andrew Hayden (chromium.org), 2014/10/31 11:38:06]

Done.

+        ],
       }],
       ['enable_printing!=0', {
         'chromium_browser_dependencies': [
           '../printing/printing.gyp:printing',
         ],
       }],
       ['enable_printing==1', {
         'chromium_browser_dependencies': [
           'service',
         ],
@@ skipping 707 matching lines @@
                 'service/service_utility_process_host.cc',
                 'service/service_utility_process_host.h',
               ],
             }],
           ],
         },
       ],
     }],
   ],  # 'conditions'
 }