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

chrome/chrome_tests.gypi

Index: chrome/chrome_tests.gypi
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index cfaa004e767c8c0ebdcce82bfc3f12631c28d97f..3edcb6fab30d41b3e4f27acee2c9912774636254 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -548,9 +548,15 @@
       'browser/task_manager/task_manager_browsertest_util.cc',
       'browser/task_manager/task_manager_browsertest_util.h',
       'browser/themes/theme_service_browsertest.cc',
-      'browser/translate/translate_browsertest.cc',
       'browser/translate/cld_data_harness.cc',
       'browser/translate/cld_data_harness.h',
+      'browser/translate/cld_data_harness_factory.cc',
+      'browser/translate/cld_data_harness_factory.h',
+      'browser/translate/component_cld_data_harness.cc',
+      'browser/translate/component_cld_data_harness.h',
+      'browser/translate/standalone_cld_data_harness.cc',
+      'browser/translate/standalone_cld_data_harness.h',
+      'browser/translate/translate_browsertest.cc',
       'browser/translate/translate_manager_browsertest.cc',
       'browser/ui/app_list/app_list_controller_browsertest.cc',
       'browser/ui/app_list/app_list_service_impl_browsertest.cc',
@@ -982,6 +988,12 @@
         'test/ppapi/ppapi_interactive_browsertest.cc',
       ],
       'conditions': [
+        [ 'cld_version==2', {
+          'dependencies': [
+            # Interactive tests should use whatever CLD2 data access mode that
+            # the application embedder is using.
+            '../third_party/cld_2/cld_2.gyp:cld2_platform_impl', ],
+        }],
         ['use_x11==1', {
           'dependencies': [
             '../build/linux/system.gyp:xtst',
@@ -1730,24 +1742,11 @@
         },
       },
       'conditions': [
-        ['cld2_data_source=="component"', {
-          'sources': [
-            'browser/translate/component_cld_data_harness.cc',
-            'browser/translate/component_cld_data_harness.h',
-          ]},
-        ],
-        ['cld2_data_source=="standalone"', {
-          'sources': [
-            'browser/translate/standalone_cld_data_harness.cc',
-            'browser/translate/standalone_cld_data_harness.h',
-          ]},
-        ],
-        ['cld2_data_source=="static"', {
-          'sources': [
-            'browser/translate/static_cld_data_harness.cc',
-            'browser/translate/static_cld_data_harness.h',
-          ]},
-        ],
+        [ 'cld_version==2', {
+          'dependencies': [
+            # Because the browser_tests use translate, they need CLD data.
+            '../third_party/cld_2/cld_2.gyp:cld2_platform_impl', ],
+        }],
         ['enable_one_click_signin==0', {
           'sources!': [
             'browser/ui/sync/one_click_signin_bubble_links_delegate_browsertest.cc',
@@ -2312,6 +2311,12 @@
         },
       ],
       'conditions': [
+        [ 'cld_version==2', {
+          'dependencies': [
+            # Interactive tests should use whatever CLD2 data access mode that
+            # the application embedder is using.
+            '../third_party/cld_2/cld_2.gyp:cld2_platform_impl', ],
+        }],
         ['OS=="win"', {
           'sources': [
             '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
@@ -2588,6 +2593,13 @@
         'browser/sync/test/integration/two_client_typed_urls_sync_test.cc',
       ],
       'conditions': [
+        [ 'cld_version==2', {
+          'dependencies': [
+            # Language detection is irrelevant to sync, so it can depend on
+            # any implementation for CLD2. Dynamic is smaller, so go with
+            # dynamic.
+            '../third_party/cld_2/cld_2.gyp:cld2_dynamic', ],
+        }],
         ['OS=="linux"', {
           'dependencies': [
             '../build/linux/system.gyp:ssl',
@@ -2697,6 +2709,13 @@
         'test/data/resource.rc',
       ],
       'conditions': [
+        [ 'cld_version==2', {
+          'dependencies': [
+            # Language detection is irrelevant to sync, so it can depend on
+            # any implementation for CLD2. Dynamic is smaller, so go with
+            # dynamic.
+            '../third_party/cld_2/cld_2.gyp:cld2_dynamic', ],
+        }],
         ['OS=="linux"', {
           'dependencies': [
             '../build/linux/system.gyp:ssl',