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

chrome/chrome_shell.gypi

Index: chrome/chrome_shell.gypi
diff --git a/chrome/chrome_shell.gypi b/chrome/chrome_shell.gypi
index 20a7aae4fac1d58b6ef94a4eeea0316d7ca6e453..e566dbe32a192de77ba5de128245f79e9477f00e 100644
--- a/chrome/chrome_shell.gypi
+++ b/chrome/chrome_shell.gypi
@@ -40,6 +40,11 @@
           'dependencies': [
             '../base/allocator/allocator.gyp:allocator', ],
         }],
+        [ 'cld_version==2', {
+          'dependencies': [
+            # Chrome shell should always use the statically-linked CLD data.
+            '../third_party/cld_2/cld_2.gyp:cld2_static', ],
+        }],
         ['OS=="android"', {
           'direct_dependent_settings': {
             'ldflags': [