Revert 235752 "Fix chrome upload with content uri"

trunk/src/base/base.gyp

Index: trunk/src/base/base.gyp
===================================================================
--- trunk/src/base/base.gyp	(revision 235758)
+++ trunk/src/base/base.gyp	(working copy)
@@ -896,14 +896,6 @@
             'test/test_file_util_linux.cc',
           ],
         }],
-        ['OS == "android"', {
-          'dependencies': [
-            'base_unittests_jni_headers',
-          ],
-          'include_dirs': [
-            '<(SHARED_INTERMEDIATE_DIR)/base',
-          ],
-        }],
       ],
       'sources': [
         'test/expectations/expectation.cc',
@@ -956,7 +948,6 @@
         'test/task_runner_test_template.h',
         'test/test_file_util.cc',
         'test/test_file_util.h',
-        'test/test_file_util_android.cc',
         'test/test_file_util_linux.cc',
         'test/test_file_util_mac.cc',
         'test/test_file_util_posix.cc',
@@ -1223,7 +1214,6 @@
           'sources': [
             'android/java/src/org/chromium/base/ActivityStatus.java',
             'android/java/src/org/chromium/base/BuildInfo.java',
-            'android/java/src/org/chromium/base/ContentUriUtils.java',
             'android/java/src/org/chromium/base/CpuFeatures.java',
             'android/java/src/org/chromium/base/ImportantFileWriterAndroid.java',
             'android/java/src/org/chromium/base/MemoryPressureListener.java',
@@ -1249,17 +1239,6 @@
           'includes': [ '../build/jni_generator.gypi' ],
         },
         {
-          'target_name': 'base_unittests_jni_headers',
-          'type': 'none',
-          'sources': [
-            'test/android/java/src/org/chromium/base/ContentUriTestUtils.java',
-          ],
-          'variables': {
-            'jni_gen_package': 'base',
-          },
-          'includes': [ '../build/jni_generator.gypi' ],
-        },
-        {
           'target_name': 'base_java',
           'type': 'none',
           'variables': {
@@ -1279,17 +1258,6 @@
           ],
         },
         {
-          'target_name': 'base_java_unittest_support',
-          'type': 'none',
-          'dependencies': [
-            'base_java',
-          ],
-          'variables': {
-            'java_in_dir': '../base/test/android/java',
-          },
-          'includes': [ '../build/java.gypi' ],
-        },
-        {
           'target_name': 'base_java_activity_state',
           'type': 'none',
           # This target is used to auto-generate ActivityState.java
@@ -1371,7 +1339,6 @@
           'type': 'none',
           'dependencies': [
             'base_java',
-            'base_java_unittest_support',
             'base_unittests',
           ],
           'variables': {