Revert 235752 "Fix chrome upload with content uri"

trunk/src/base/base.gyp

 # Copyright (c) 2012 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': {
     'chromium_code': 1,
   },
   'includes': [
     '../build/win_precompile.gypi',
@@ skipping 878 matching lines @@
           'sources!': [
             'test/scoped_locale.cc',
             'test/scoped_locale.h',
           ],
         }],
         ['os_bsd==1', {
           'sources!': [
             'test/test_file_util_linux.cc',
           ],
         }],
-        ['OS == "android"', {
-          'dependencies': [
-            'base_unittests_jni_headers',
-          ],
-          'include_dirs': [
-            '<(SHARED_INTERMEDIATE_DIR)/base',
-          ],
-        }],
       ],
       'sources': [
         'test/expectations/expectation.cc',
         'test/expectations/expectation.h',
         'test/expectations/parser.cc',
         'test/expectations/parser.h',
         'test/gtest_xml_util.cc',
         'test/gtest_xml_util.h',
         'test/launcher/test_launcher.cc',
         'test/launcher/test_launcher.h',
@@ skipping 32 matching lines @@
         'test/sequenced_worker_pool_owner.cc',
         'test/sequenced_worker_pool_owner.h',
         'test/simple_test_clock.cc',
         'test/simple_test_clock.h',
         'test/simple_test_tick_clock.cc',
         'test/simple_test_tick_clock.h',
         'test/task_runner_test_template.cc',
         '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',
         'test/test_file_util_win.cc',
         'test/test_listener_ios.h',
         'test/test_listener_ios.mm',
         'test/test_pending_task.cc',
         'test/test_pending_task.h',
         'test/test_process_killer_win.cc',
         'test/test_process_killer_win.h',
@@ skipping 246 matching lines @@
       ],
     }],
     ['OS == "android"', {
       'targets': [
         {
           'target_name': 'base_jni_headers',
           'type': 'none',
           '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',
             'android/java/src/org/chromium/base/JavaHandlerThread.java',
             'android/java/src/org/chromium/base/PathService.java',
             'android/java/src/org/chromium/base/PathUtils.java',
             'android/java/src/org/chromium/base/PowerMonitor.java',
             'android/java/src/org/chromium/base/SystemMessageHandler.java',
             'android/java/src/org/chromium/base/SysUtils.java',
             'android/java/src/org/chromium/base/ThreadUtils.java',
           ],
           'conditions': [
             ['google_tv==1', {
              'sources': [
                'android/java/src/org/chromium/base/ContextTypes.java',
              ],
             }],
           ],
           'variables': {
             'jni_gen_package': 'base',
             'jni_generator_ptr_type': 'long',
           },
           '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': {
             'java_in_dir': '../base/android/java',
           },
           'dependencies': [
             'base_java_activity_state',
             'base_java_memory_pressure_level_list',
           ],
           'includes': [ '../build/java.gypi' ],
           'conditions': [
             ['android_webview_build==0', {
               'dependencies': [
                 '../third_party/jsr-305/jsr-305.gyp:jsr_305_javalib',
               ],
             }]
           ],
         },
         {
-          '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
           # from a template file. The source file contains a list of
           # Java constant declarations matching the ones in
           # android/activity_state_list.h.
           'sources': [
             'android/java/src/org/chromium/base/ActivityState.template',
           ],
           'variables': {
@@ skipping 61 matching lines @@
     # in the gyp make generator.  What is the correct way to extract
     # this path from gyp and into 'raw' for input to antfiles?
     # Hard-coding in the gypfile seems a poor choice.
     ['OS == "android" and gtest_target_type == "shared_library"', {
       'targets': [
         {
           'target_name': 'base_unittests_apk',
           'type': 'none',
           'dependencies': [
             'base_java',
-            'base_java_unittest_support',
             'base_unittests',
           ],
           'variables': {
             'test_suite_name': 'base_unittests',
             'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)base_unittests<(SHARED_LIB_SUFFIX)',
           },
           'includes': [ '../build/apk_test.gypi' ],
         },
       ],
     }],
@@ skipping 10 matching lines @@
             'base_unittests.isolate',
           ],
           'sources': [
             'base_unittests.isolate',
           ],
         },
       ],
     }],
   ],
 }