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

chrome/chrome.gyp

Index: chrome/chrome.gyp
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 405d6b4d2c4746aa1c696777b6a3be59576911e2..b32d6e54dde05e725379266f05a61dc75d2bda0f 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -39,6 +39,14 @@
           '../content/content.gyp:content_ppapi_plugin',
           '../third_party/WebKit/public/blink_devtools.gyp:blink_devtools_frontend_resources',
         ],
+        'conditions': [
+          [ 'cld_version==0 or cld_version==2', {
+            'chromium_child_dependencies': [
+              # Use whatever CLD2 data access mode that the application
+              # embedder is using.
+              '<(DEPTH)/third_party/cld_2/cld_2.gyp:cld2_platform_impl', ],
+          }],
+        ],
       }],
       ['enable_basic_printing==1 or enable_print_preview==1', {
         'chromium_browser_dependencies': [