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

components/components_tests.gyp

Index: components/components_tests.gyp
diff --git a/components/components_tests.gyp b/components/components_tests.gyp
index f547c5f78b3ae17e6c3886800e7951c4924936de..f6e5d0e48dad9aa588ac3e52461476b288ac615e 100644
--- a/components/components_tests.gyp
+++ b/components/components_tests.gyp
@@ -476,6 +476,11 @@
                 'components.gyp:constrained_window',
               ]
             }],
+            [ 'cld_version==2', {
+              'dependencies': [
+                # Unit tests should always use statically-linked CLD data.
+                '../third_party/cld_2/cld_2.gyp:cld2_static', ],
+            }],
             ['OS != "ios"', {
               'sources': [
                 'autofill/content/renderer/renderer_save_password_progress_logger_unittest.cc',