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.
 {
   'includes': [
     'js_unittest_vars.gypi',
   ],
   'targets': [
     {
       'target_name': 'interactive_ui_tests',
@@ skipping 1384 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/component_cld_data_harness.cc',
+        'browser/translate/component_cld_data_harness.h',
         '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/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/ash/accelerator_commands_browsertest.cc',
         'browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc',
         'browser/ui/ash/launcher/launcher_favicon_loader_browsertest.cc',
         'browser/ui/ash/keyboard_controller_browsertest.cc',
@@ skipping 275 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',
-          ]},
-        ],
         ['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 1327 matching lines @@
             ['enable_webrtc==1', {
               'dependencies': [
                 '../third_party/libjingle/libjingle.gyp:libjingle_webrtc'
               ]
             }],
           ],
         }]
     }],
   ],  # 'conditions'
 }