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

chrome/chrome_tests_unit.gypi

Index: chrome/chrome_tests_unit.gypi
diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi
index 321a404cb07bf40213b5ce91817f324fe6ded70f..db50fc2233317bc0879a1fc390aaca03f2afe682 100644
--- a/chrome/chrome_tests_unit.gypi
+++ b/chrome/chrome_tests_unit.gypi
@@ -2326,6 +2326,12 @@
             '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
           ],
         }],
+        [ 'cld_version==2', {
+          'dependencies': [
+            # Unit tests should be independent of the CLD2 access mechanism,
+            # just use static for simplicity.
+            '../third_party/cld_2/cld_2.gyp:cld2_static', ],
+        }],
         ['OS=="linux"', {
           'dependencies': [
             '../build/linux/system.gyp:ssl',