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 87730603624fb31ecf6b4a2c90944c0ed6e966d3..e76ee7dd3ece452960ca910509ea7991ddbd9330 100644
--- a/components/components_tests.gyp
+++ b/components/components_tests.gyp
@@ -481,6 +481,11 @@
                 '<(DEPTH)/base/allocator/allocator.gyp:allocator',
               ],
             }],
+            [ 'cld_version==0 or cld_version==2', {
+              'dependencies': [
+                # Unit tests should always use statically-linked CLD data.
+                '<(DEPTH)/third_party/cld_2/cld_2.gyp:cld2_static', ],
+            }],
             ['OS != "ios"', {
               'sources': [
                 'autofill/content/renderer/renderer_save_password_progress_logger_unittest.cc',