Revert 253938 "Enable icu_use_data_file_flag on Android"

trunk/src/content/content_tests.gypi

 # Copyright (c) 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.
 
 {
   'targets': [
     {
       'target_name': 'test_support_content',
       'type': 'static_library',
       'dependencies': [
@@ skipping 1402 matching lines @@
           'variables': {
             'test_suite_name': 'content_unittests',
             'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)content_unittests<(SHARED_LIB_SUFFIX)',
           },
           'includes': [ '../build/apk_test.gypi' ],
         },
         {
           'target_name': 'content_browsertests_apk',
           'type': 'none',
           'dependencies': [
-            'content.gyp:content_icudata',
             'content.gyp:content_java',
             'content_browsertests',
             'content_java_test_support',
             'content_shell_java',
           ],
           'variables': {
             'apk_name': 'content_browsertests',
             'java_in_dir': 'shell/android/browsertests_apk',
             'resource_dir': 'shell/android/browsertests_apk/res',
             'native_lib_target': 'libcontent_browsertests',
             'additional_input_paths': ['<(PRODUCT_DIR)/content_shell/assets/content_shell.pak'],
             'asset_location': '<(PRODUCT_DIR)/content_shell/assets',
-            'conditions': [
-              ['icu_use_data_file_flag==1', {
-                'additional_input_paths': [
-                  '<(PRODUCT_DIR)/icudtl.dat',
-                ],
-              }],
-            ],
           },
           'includes': [ '../build/java_apk.gypi' ],
         },
         {
           'target_name': 'content_perftests_apk',
           'type': 'none',
           'dependencies': [
             'content.gyp:content_java',
             'content_perftests',
           ],
           'variables': {
             'test_suite_name': 'content_perftests',
             'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)content_perftests<(SHARED_LIB_SUFFIX)',
           },
           'includes': [ '../build/apk_test.gypi' ],
         },
         {
           'target_name': 'chromium_linker_test_apk',
           'type': 'none',
           'dependencies': [
             'chromium_android_linker_test',
-            'content.gyp:content_icudata',
             'content.gyp:content_java',
             'content_shell_java',
           ],
           'variables': {
             'apk_name': 'ChromiumLinkerTest',
             'java_in_dir': 'shell/android/linker_test_apk',
             'resource_dir': 'shell/android/linker_test_apk/res',
             'native_lib_target': 'libchromium_android_linker_test',
             'additional_input_paths': ['<(PRODUCT_DIR)/content_shell/assets/content_shell.pak'],
             'asset_location': '<(PRODUCT_DIR)/content_shell/assets',
             'use_chromium_linker': '1',
             'enable_chromium_linker_tests': '1',
-            'conditions': [
-              ['icu_use_data_file_flag==1', {
-                'additional_input_paths': [
-                  '<(PRODUCT_DIR)/icudtl.dat',
-                ],
-              }],
-            ],
           },
           'includes': [ '../build/java_apk.gypi' ],
         },
         {
           'target_name': 'chromium_android_linker_test',
           'type': 'shared_library',
           'defines!': ['CONTENT_IMPLEMENTATION'],
           'dependencies': [
             'chromium_android_linker_test_jni_headers',
             'content_shell_lib',
@@ skipping 225 matching lines @@
                   'files': ['<(PRODUCT_DIR)/libnpapi_test_plugin.so'],
                 },
               ],
             }],
           ],
         },
       ],
     }],
   ],
 }