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 9a6a949d5d3d618a029e6b0aead054217485a643..a83ab38bc1b70547364fa49198a9b8bb20c228ab 100644
--- a/components/components_tests.gyp
+++ b/components/components_tests.gyp
@@ -454,6 +454,11 @@
                 'bookmarks/browser/bookmark_node_data_unittest.cc',
               ],
             }],
+            [ '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',