Enable icu_use_data_file_flag on Android

content/content_tests.gypi

Index: content/content_tests.gypi
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index db64b35bd57381b6e7f76fb83915035ce0aa25e6..174441772bd39317e089d508cffbb3c06f355718 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -1417,6 +1417,7 @@
           'target_name': 'content_browsertests_apk',
           'type': 'none',
           'dependencies': [
+            'content.gyp:content_icudata',
             'content.gyp:content_java',
             'content_browsertests',
             'content_java_test_support',
@@ -1429,6 +1430,13 @@
             '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' ],
         },
@@ -1450,6 +1458,7 @@
           'type': 'none',
           'dependencies': [
             'chromium_android_linker_test',
+            'content.gyp:content_icudata',
             'content.gyp:content_java',
             'content_shell_java',
           ],
@@ -1462,6 +1471,13 @@
             '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' ],
         },