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

chrome/chrome_tests.gypi

 # Copyright 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 {
   'variables': {
     'chrome_browser_extensions_test_support_sources': [
       # A list of sources which is shared between different browser tests.
       'browser/apps/app_browsertest_util.cc',
       'browser/apps/app_browsertest_util.h',
       'browser/extensions/browsertest_util.cc',
@@ skipping 530 matching lines @@
       'browser/ssl/ssl_client_certificate_selector_test.h',
       'browser/sync_file_system/mock_local_change_processor.cc',
       'browser/sync_file_system/mock_local_change_processor.h',
       'browser/sync_file_system/mock_remote_file_sync_service.cc',
       'browser/sync_file_system/mock_remote_file_sync_service.h',
       'browser/tab_contents/view_source_browsertest.cc',
       'browser/task_manager/task_manager_browsertest.cc',
       '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',
       'browser/ui/app_list/app_list_service_views_browsertest.cc',
       'browser/ui/app_list/search/people/people_provider_browsertest.cc',
       'browser/ui/app_list/search/webstore/webstore_provider_browsertest.cc',
       'browser/ui/app_list/speech_recognizer_browsertest.cc',
       'browser/ui/ash/accelerator_commands_browsertest.cc',
       'browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc',
       'browser/ui/ash/launcher/launcher_favicon_loader_browsertest.cc',
@@ skipping 801 matching lines @@
       'include_dirs': [
         '..',
       ],
       'defines': [
         'HAS_OUT_OF_PROC_TEST_RUNNER',
       ],
       'sources': [
         '<@(chrome_interactive_ui_test_sources)',
       ],
       'conditions': [
+        [ 'cld_version==0 or cld_version==2', {
+          'dependencies': [
+            # Interactive tests should use whatever CLD2 data access mode that
+            # the application embedder is using.
+            '<(DEPTH)/third_party/cld_2/cld_2.gyp:cld2_platform_impl', ],
+        }],
         ['use_x11==1', {
           'dependencies': [
             '../build/linux/system.gyp:xtst',
             '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
           ],
         }],
         ['OS=="linux" and use_aura==1', {
           # TODO(gbillock): aura linux does not support the automation for
           # SendMouseMoveNotifyWhenDone
           'sources!': [
@@ skipping 551 matching lines @@
       'msvs_settings': {
         'VCLinkerTool': {
           'conditions': [
             ['incremental_chrome_dll==1', {
               'UseLibraryDependencyInputs': "true",
             }],
           ],
         },
       },
       '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==0 or cld_version==2', {
+          'dependencies': [
+            # Because the browser_tests use translate, they need CLD data.
+            '<(DEPTH)/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',
           ]
         }],
         ['enable_autofill_dialog==0', {
           'sources!': [
             'browser/ui/autofill/autofill_dialog_controller_browsertest.cc',
           ]
         }],
@@ skipping 530 matching lines @@
             '<@(_inputs)',
             'webui',
             '--external', '<(external_v8)',
             '<(RULE_INPUT_PATH)',
             'chrome/<(RULE_INPUT_DIRNAME)/<(RULE_INPUT_ROOT).js',
             '<@(_outputs)',
           ],
         },
       ],
       'conditions': [
+        [ 'cld_version==0 or cld_version==2', {
+          'dependencies': [
+            # Interactive tests should use whatever CLD2 data access mode that
+            # the application embedder is using.
+            '<(DEPTH)/third_party/cld_2/cld_2.gyp:cld2_platform_impl', ],
+        }],
         ['OS=="win"', {
           'sources': [
             '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
             '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_unscaled_resources.rc',
           ],
           'include_dirs': [
             '<(DEPTH)/third_party/wtl/include',
           ],
           'dependencies': [
             'chrome_version_resources',
@@ skipping 149 matching lines @@
         '<(protoc_out_dir)',
       ],
       # TODO(phajdan.jr): Only temporary, to make transition easier.
       'defines': [
         'HAS_OUT_OF_PROC_TEST_RUNNER',
       ],
       'sources': [
         '<@(sync_integration_tests_sources)',
       ],
       'conditions': [
+        [ 'cld_version==0 or 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.
+            '<(DEPTH)/third_party/cld_2/cld_2.gyp:cld2_dynamic', ],
+        }],
         ['OS=="linux"', {
           'dependencies': [
             '../build/linux/system.gyp:ssl',
           ],
         }],
         ['OS=="mac"', {
           # The sync_integration_tests do not run on mac without this flag.
           # Search for comments about "xcode_settings" elsewhere in this file.
           'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']},
           # Dictionary sync is disabled on Mac.
@@ skipping 75 matching lines @@
         '<(INTERMEDIATE_DIR)',
         '<(protoc_out_dir)',
       ],
       'defines': [
         'HAS_OUT_OF_PROC_TEST_RUNNER',
       ],
       'sources': [
         '<@(sync_performance_tests_sources)',
       ],
       'conditions': [
+        [ 'cld_version==0 or 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.
+            '<(DEPTH)/third_party/cld_2/cld_2.gyp:cld2_dynamic', ],
+        }],
         ['OS=="linux"', {
           'dependencies': [
             '../build/linux/system.gyp:ssl',
           ],
         }],
         ['OS=="mac"', {
           # The sync_performance_tests do not run on mac without this flag.
           # Search for comments about "xcode_settings" elsewhere in this file.
           'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']},
           # Dictionary sync is disabled on Mac.
@@ skipping 424 matching lines @@
             ['enable_webrtc==1', {
               'dependencies': [
                 '../third_party/libjingle/libjingle.gyp:libjingle_webrtc'
               ]
             }],
           ],
         }]
     }],
   ],  # 'conditions'
 }