Adding AndroidProxySelectorTest to ContentShell

Adding AndroidProxySelectorTests to the ContentShellTest bundle. These tests
are used to check if the proxy settings are functioning correctly.

CRBUG=136719


Review URL: https://chromiumcodereview.appspot.com/10830287

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151779 0039d316-1c4b-4281-b951-d872f2087c98

content/content_tests.gypi

@@ -800,21 +800,20 @@
           'dependencies': [
             'content_shell_apk',
             'content_javatests',
+            '../net/net.gyp:net_javatests',
             '../tools/android/forwarder/forwarder.gyp:forwarder',
           ],
-          'actions': [
-            {
-              'action_name': 'copy_base_javatests_jar',
-              'inputs': ['<(PRODUCT_DIR)/lib.java/chromium_base_javatests.jar'],
-              'outputs': ['<(PRODUCT_DIR)/content_shell_test/java/libs/chromium_base_javatests.jar'],
-              'action': ['cp', '<@(_inputs)', '<@(_outputs)'],
-            },
+          'copies': [
             {
-              'action_name': 'copy_content_javatests_jar',
-              'inputs': ['<(PRODUCT_DIR)/lib.java/chromium_content_javatests.jar'],
-              'outputs': ['<(PRODUCT_DIR)/content_shell_test/java/libs/chromium_content_javatests.jar'],
-              'action': ['cp', '<@(_inputs)', '<@(_outputs)'],
+              'destination': '<(PRODUCT_DIR)/content_shell_test/java/libs',
+              'files': [
+                '<(PRODUCT_DIR)/lib.java/chromium_base_javatests.jar',
+                '<(PRODUCT_DIR)/lib.java/chromium_net_javatests.jar',
+                '<(PRODUCT_DIR)/lib.java/chromium_content_javatests.jar',
+              ],
             },
+          ],
+          'actions': [
             {
               'action_name': 'content_shell_test_generate_apk',
               'inputs': [

content/shell/android/javatests/content_shell_test_apk.xml

@@ -64,6 +64,9 @@
       <zipfileset
          includes="**/*.class"
          src="${PRODUCT_DIR}/content_shell_test/java/libs/chromium_content_javatests.jar"/>
+      <zipfileset
+         includes="**/*.class"
+         src="${PRODUCT_DIR}/content_shell_test/java/libs/chromium_net_javatests.jar"/>
     </jar>
 
   </target>

net/net.gyp

@@ -1994,6 +1994,23 @@
           ],
           'includes': [ '../build/java.gypi' ],
         },
+        {
+          'target_name': 'net_javatests',
+          'type': 'none',
+          'variables': {
+            'package_name': 'net_javatests',
+            'java_in_dir': '../net/android/javatests',
+          },
+          'dependencies': [
+            '../base/base.gyp:base_java',
+            '../base/base.gyp:base_java_test_support',
+          ],
+          'export_dependent_settings': [
+            '../base/base.gyp:base_java',
+            '../base/base.gyp:base_java_test_support',
+          ],
+          'includes': [ '../build/java.gypi' ],
+        },
       ],
     }],
     # Special target to wrap a gtest_target_type==shared_library