Remove {base,net}_java dependencies from GYP client targets on Android.

content/content_tests.gypi

 # 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.
 
 {
   'targets': [
     {
       'target_name': 'test_support_content',
       'type': 'static_library',
       'defines!': ['CONTENT_IMPLEMENTATION'],
@@ skipping 768 matching lines @@
     }],
     # Special target to wrap a gtest_target_type==shared_library
     # content_unittests into an android apk for execution.
     # See base.gyp for TODO(jrg)s about this strategy.
     ['OS == "android" and gtest_target_type == "shared_library"', {
       'targets': [
         {
           'target_name': 'content_unittests_apk',
           'type': 'none',
           'dependencies': [
-            '../base/base.gyp:base_java',
-            '../net/net.gyp:net_java',
             'content_java',
             'content_unittests',
           ],
           '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' ],
         },
       ],
     }],
     ['OS == "android"', {
       'targets': [
         {
           'target_name': 'content_javatests',
           'type': 'none',
           'dependencies': [
-            '../base/base.gyp:base_java',
+            '../base/base.gyp:base',
             '../base/base.gyp:base_java_test_support',
             'content_common',
             'content_java',
           ],
           'variables': {
             'package_name': 'content_javatests',
             'java_in_dir': '../content/public/android/javatests',
           },
           'includes': [ '../build/java.gypi' ],
         },
@@ skipping 32 matching lines @@
                 '-buildfile',
                 '<(DEPTH)/content/shell/android/javatests/content_shell_test_apk.xml',
               ]
             }
           ],
         },
       ],
     }],
   ],
 }