Factor out content shell and tests into a standalone gyp

android_webview/android_webview_tests.gypi

Index: android_webview/android_webview_tests.gypi
diff --git a/android_webview/android_webview_tests.gypi b/android_webview/android_webview_tests.gypi
index bb9cc0f195dba351ec580f59a22de911e1cb15ce..e416559c53ad2846a8cb500c0c338e0e557df55c 100644
--- a/android_webview/android_webview_tests.gypi
+++ b/android_webview/android_webview_tests.gypi
@@ -51,7 +51,7 @@
       'type': 'none',
       'dependencies': [
         '../base/base.gyp:base_java_test_support',
-        '../content/content.gyp:content_java_test_support',
+        '../content/content_shell_and_tests.gyp:content_java_test_support',
         '../net/net.gyp:net_java_test_support',
         'android_webview_apk_java',
       ],
@@ -67,7 +67,7 @@
       'type': '<(gtest_target_type)',
       'dependencies': [
         '../base/base.gyp:test_support_base',
-        '../content/content.gyp:test_support_content',
+        '../content/content_shell_and_tests.gyp:test_support_content',
         '../net/net.gyp:net_test_support',
         '../testing/android/native_test.gyp:native_test_native_code',
         '../testing/gmock.gyp:gmock',
@@ -94,7 +94,7 @@
       'type': 'none',
       'dependencies': [
         '../base/base.gyp:base_java_test_support',
-        '../content/content.gyp:content_java_test_support',
+        '../content/content_shell_and_tests.gyp:content_java_test_support',
         'android_webview_java',
       ],
       'variables': {